git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7e47161 7702c72)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 04:05:54 +0000 (14:05 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 04:05:54 +0000 (14:05 +1000)
commit	4c7e922a2bb4a349594de49ba494b8844ab2d7e4
tree	6e84a3a58581090f0511b9d90364eeba8668bf1c	tree \| snapshot
parent	7e47161fbbb253ef4f9c6f4e94a0215eaec08639	commit \| diff
parent	7702c722560787b9059e475f7f30c104f5f5315a	commit \| diff

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/Kconfig

17 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/switch_to.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/vtime.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
tools/perf/perf.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events-test.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules