Merge branch 'diablo' into kbc-diablo

Conflicts:
	arch/arm/Makefile
	arch/arm/include/asm/rwsem.h
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-8x60.c
	arch/arm/mach-msm/avs.h
	arch/arm/mach-msm/board-msm8x60_celox.c
	arch/arm/mach-msm/include/mach/rpm-8660.h
	arch/arm/mach-msm/msm_mpdecision.c
	arch/arm/vfp/Makefile
	block/Kconfig.iosched
	block/Makefile
	block/bfq-cgroup.c
	block/bfq-ioc.c
	block/bfq-iosched.c
	block/bfq.h
	block/sio-iosched.c
	drivers/cpufreq/cpufreq.c
	drivers/input/keyboard/Kconfig
	kernel/sched.c
	kernel/sched_debug.c
	lib/Makefile
	lib/rwsem-spinlock.c
	lib/rwsem.c
	lib/string.c
	scripts/setlocalversion
Revert "ARM: use generic strnlen_user and strncpy_from_user"

This reverts commit 70aa60950929d8989bb0ebe29dfd465cc6ada672.
Revert "sched/nohz: Rewrite, fix and add more accurate load-avg computation"

This reverts commit ca9d082f0f9a80480f7ef1794d956861e819b123.
Fixed Build error