update defconfig

Conflicts:

	arch/arm/configs/jf_brood_defconfig
	block/Kconfig.iosched
	block/Makefile