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: 4737039 6abf30c)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Sep 2012 03:16:58 +0000 (13:16 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Sep 2012 03:16:58 +0000 (13:16 +1000)
commit	9f7a66f5ac7432dc849430259a1431fc6a82e6b2
tree	c8d717a7864afdaa8e363bb8cbecd432390a248a	tree \| snapshot
parent	4737039e975fcfd50db3d354bd2d016e7e2a39ec	commit \| diff
parent	6abf30caf4a78a6887add8066734ffedf1357357	commit \| diff

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

Conflicts:
arch/Kconfig

13 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/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/trace/trace.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events-test.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules