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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 02:57:32 +0000 (12:57 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 02:57:32 +0000 (12:57 +1000)
commit	08d6dd9ea924aaa3321de7462e5db97e1241d523
tree	e74a412a890f4cebdc7715bd2ac43737de63b4f6	tree \| snapshot
parent	a27012de16b3d17c70db06015bd06a0afe237787	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

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