]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 21:23:24 +0000 (22:23 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 21:23:24 +0000 (22:23 +0100)
commit04c856f29b55ae201c8aa8625699168734def15d
tree690bbc2241c25bb4ca7fc00b740fd0d006101017
parent599400c5bc67f1ccb3198dc288ea65a0e49bb392
parent2eb3090631e1f3c5920e27e0a51ed876e88fe871
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
mm/mprotect.c
18 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/include/asm/Kbuild
arch/arm/kernel/setup.c
arch/arm64/kernel/setup.c
arch/powerpc/Kconfig
arch/x86/Kconfig
arch/x86/kernel/smpboot.c
drivers/acpi/processor_idle.c
drivers/idle/intel_idle.c
include/linux/mm.h
include/linux/sched.h
include/linux/wait.h
init/Kconfig
mm/huge_memory.c
mm/memory.c
mm/migrate.c
mm/mprotect.c