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: 0306d0b 433ed0e)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Sep 2012 04:31:56 +0000 (14:31 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 4 Sep 2012 04:31:56 +0000 (14:31 +1000)
commit	f54a58788e567a10b25bdb56a7690610bb0dffff
tree	785305364735065e9625be7af20a7f267724ad46	tree \| snapshot
parent	0306d0bc4fcdbd019fd53f8ed1d4886abed71723	commit \| diff
parent	433ed0e1a3d14e5ca96d5a5b2e7e8f78c74c8708	commit \| diff

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

Conflicts:
arch/Kconfig

14 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
include/linux/perf_event.h	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