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: de6d793 ba05c76)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 03:52:35 +0000 (13:52 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 03:52:35 +0000 (13:52 +1000)
commit	d06d56a00607f8c88b99461a27b87f186992432f
tree	101b276a058871a40f93fc3529d45df544a3e948	tree \| snapshot
parent	de6d793291581bc5e03b0e369743c6e6c9b638fb	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