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: 330eae7 b75bc75)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 6 Dec 2011 01:44:15 +0000 (12:44 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 6 Dec 2011 01:44:15 +0000 (12:44 +1100)
commit	f44ac9a21fc98858542d95b2e1676aa44ac634c5
tree	9147d2e305cb5e0528943383534244ed0ef64719	tree \| snapshot
parent	330eae777206b30bce44c5f7aff42faa1fd08135	commit \| diff
parent	b75bc75648b737b73909dd7726a8b4755e462471	commit \| diff

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

Conflicts:
arch/mips/kernel/perf_event_mipsxx.c

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/perf_event_mipsxx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/stats.h	diff1 \|	diff2 \|	blob \| history
mm/slab.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules