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: 84bd9a2 4e15ac6)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 6 Sep 2012 02:50:21 +0000 (12:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 6 Sep 2012 02:50:21 +0000 (12:50 +1000)
commit	dbe474b4e93a62ca593d69f419960e53653b0cdf
tree	6bc42394e06e5e499b9f5f9aa0e7e77b2fcb44b9	tree \| snapshot
parent	84bd9a24ae1136e2a8e1f436df5fb44681e80f57	commit \| diff
parent	4e15ac60bf113ce151b3a5f0bf136d2877683e43	commit \| diff

Merge branch 'quilt/rr'

Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig

13 files changed:

arch/alpha/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/c6x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/cris/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/m68k/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/module.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/module.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/unicore32/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/xtensa/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules