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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78f69e0 650470d)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 12 Sep 2012 04:04:56 +0000 (14:04 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 12 Sep 2012 04:04:56 +0000 (14:04 +1000)
commit	eb6df0085e0e18007f3ce8f28256970f4b5ee18f
tree	496f3aca676e2f16e50c27a1a3410aabd4512f77	tree \| snapshot
parent	78f69e0ba131474922fc2eba71c20445b8f99e0b	commit \| diff
parent	650470d1da17c20bf9700f9446775a01cbda52c3	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/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
kernel/trace/trace_functions.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