]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:39:48 +0000 (14:39 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:51:22 +0000 (14:51 +0200)
commit955b2fee301c6fc3565e0b3f071236287b06d379
tree89fca16562cd5b8d761881f848cbfb7b36a0e3e6
parentef5bfcc8f2afb0fa3ee1a38a80bf1b16a9a0d01e
parent56aa4fbf215af23efeee0d5702145960f37bbafc
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
19 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/wait.h
init/Kconfig
init/main.c
kernel/Makefile
tools/perf/config/Makefile
tools/perf/config/feature-checks/Makefile
tools/perf/config/feature-checks/test-all.c
tools/perf/config/feature-checks/test-libunwind-debug-frame.c