]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 03:21:23 +0000 (13:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 03:21:23 +0000 (13:21 +1000)
commita096b8341ab58a1fa599958caf058eb032f5738b
treedf3fcf60b8d89349ffe69eb482917a0d5e60c52e
parent9d936c097bf4c7fcd7680cc0b5c0ad48dedb108b
parentd673c23ca730080f44184733b48ff1b7a150850e
Merge branch 'quilt/rr'

Conflicts:
arch/s390/Kconfig
arch/xtensa/Kconfig
12 files changed:
arch/arm/Kconfig
arch/c6x/Kconfig
arch/cris/Kconfig
arch/m68k/Kconfig
arch/mips/Kconfig
arch/mips/include/asm/module.h
arch/mips/kernel/module.c
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/unicore32/Kconfig
arch/x86/Kconfig
arch/xtensa/Kconfig