]> 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, 26 Sep 2012 03:34:26 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 03:34:26 +0000 (13:34 +1000)
commit9b933c7d345288aeb74b8f170630cb184484ea89
treea974814eefe35f1dac493ae712b7d848416fcaf8
parente5f962c00ba860a6e442a2c2b53bd256332a8a3c
parentcd216c4105e7cf0285219e115af00abc04fb921c
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/Kconfig
arch/s390/Kconfig
20 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
include/linux/sched.h
init/Kconfig
kernel/events/core.c
kernel/fork.c
kernel/sysctl.c
kernel/trace/trace.c
kernel/trace/trace_functions.c
tools/perf/perf.h
tools/perf/util/parse-events-test.c