]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 04:29:41 +0000 (14:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 04:29:41 +0000 (14:29 +1000)
commit32d6e69ac1110ab7003c25528640cee6844db7a8
tree54cdd1fc0dcffc10cd831a3249780f3a0c3e727a
parent3b1a1ab7903e5d7e2126e2a4332036946f9301b4
parent28381f207bd78fdf51cb8123cf9a16106dfc42be
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/Kconfig
arch/s390/Kconfig
22 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/Kconfig
arch/ia64/Kconfig
arch/ia64/kernel/process.c
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
lib/Kconfig.debug
tools/perf/perf.h
tools/perf/util/parse-events-test.c