]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 06:17:04 +0000 (16:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 06:17:04 +0000 (16:17 +1000)
commitc46256170d9d60b997d440f65be5f872ed49f70d
tree1f6c79653ad4ee86877fb4856affe246b00253ed
parentfa707de8e0925114e864f9c9fcc568bfa2553662
parent9edf40f2fc6696eab3a036cecc09f244ef0be68c
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/Kconfig
21 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/Kconfig
arch/ia64/Kconfig
arch/powerpc/kernel/process.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/sched/core.c
kernel/sched/fair.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