added sio and vr io-schedulers

Conflicts:
	arch/arm/configs/cyanogenmod_p930_defconfig
	block/Makefile