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: b189350 7421bb4)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Sep 2012 02:22:00 +0000 (12:22 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Sep 2012 02:22:00 +0000 (12:22 +1000)
commit	bc06aac3dc18010ac6e8ab855f23d190af8e03d9
tree	8905111b5aa737c3bae64b5348f80d29c7673fba	tree \| snapshot
parent	b1893501b10bf2bb5b2ace32485bf77557d33fd2	commit \| diff
parent	7421bb43f691338b6bd7007372780c7663a0b68f	commit \| diff

Merge branch 'quilt/rr'

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

14 files changed:

arch/alpha/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/blackfin/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