Various tweaks

Conflicts:
	block/deadline-iosched.c

Conflicts:

	arch/arm/configs/ap33_android_defconfig