]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 04:38:04 +0000 (14:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 04:38:04 +0000 (14:38 +1000)
commit50cb910bbae66b8f9efbe629bc78b8957769fffb
treeae1434980ea4761c6011409b9579ce4cb0450d12
parent95cc1eb5b8b44eb2821fc0aebefeb98ccd20d215
parent18127261635e03a58bc186313802fde80ed0019e
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