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: bd176fe 592b4c6)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 04:42:43 +0000 (14:42 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 04:42:43 +0000 (14:42 +1000)
commit	4c274406216ceb51d6e0cc2495685998885ddda0
tree	c868e20d5bc17f40765b3b2e0e311e820ae4e64a	tree \| snapshot
parent	bd176fe236bbffe6eed67cb1879d0e7864241a25	commit \| diff
parent	592b4c63583fd4b0cbed32edbf7cf275e60ec854	commit \| diff

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

Conflicts:
arch/Kconfig

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	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/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/time/timekeeping.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules