]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:20:26 +0000 (12:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:20:26 +0000 (12:20 +1000)
commita569dd36e9eee14a3b725ffbf8652b8c34b0f018
tree9cb63a121197186afa58779b8ff7e483c41638b9
parenta871d1f6b37f95a442f20aa473166191c416ae59
parent2feb41c726bbd62147cfce7b821c8a8f0d2787ba
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