]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:07:05 +0000 (12:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:07:05 +0000 (12:07 +1000)
commitdfd3cf36ff3ce4a6c1fae492066138095f79e100
tree00a59fa796ae858b9a1becf67b5a808f0524de67
parent7cced3f8239b57b94bc8c1aba1f65888b9b322f7
parent1cd1027a3516f34d412d2e4a51a775c983b99bf1
Merge branch 'quilt/rr'

Conflicts:
arch/xtensa/Kconfig
arch/arm/Kconfig
arch/cris/Kconfig
arch/mips/Kconfig
arch/mips/kernel/Makefile
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/unicore32/Kconfig
arch/x86/Kconfig