fiops added

Conflicts:
	block/Kconfig.iosched