b3.testing

Conflicts:
	block/Kconfig.iosched
	block/Makefile
	block/sio-iosched.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h