Conflicts:
	arch/arm/common/Kconfig
	arch/arm/mm/Makefile
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
	drivers/input/Kconfig
	drivers/input/Makefile
	drivers/power/Kconfig
	kernel/futex.c