]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 03:08:00 +0000 (13:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 03:08:00 +0000 (13:08 +1000)
commitaab9577d316dc74e59eca0acf703982fba837092
tree9f0376bcbf791fd44e669a05f86d71fe865908f5
parentac125e01efe138964b5d16b72403e3b11de484a2
parent2f93bbc418b41df4151e646695ae1d1cbfff0266
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/Kconfig
arch/s390/Kconfig
19 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/Kconfig
arch/ia64/Kconfig
arch/powerpc/kernel/process.c
arch/powerpc/kernel/time.c
arch/s390/Kconfig
arch/s390/include/asm/switch_to.h
arch/s390/kernel/vtime.c
arch/x86/Kconfig
init/Kconfig
kernel/events/core.c
kernel/sysctl.c
kernel/time/timekeeping.c
kernel/trace/trace.c
kernel/trace/trace_functions.c
tools/perf/perf.h
tools/perf/util/parse-events-test.c