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: 541cfc5 ba05c76)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 22 Aug 2012 03:11:22 +0000 (13:11 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 22 Aug 2012 03:11:22 +0000 (13:11 +1000)
commit	5b04d6d29d5e037ac31efd634a307f5cd6ae071f
tree	696c34a436e5b33c46daa57d189dd4015dc1a74a	tree \| snapshot
parent	541cfc5fc3c32b4bce6e2cddc3a950a936edf3bb	commit \| diff
parent	ba05c7642bb3886ff66877dbd03c4d340c4feab3	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