]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sched/core'
authorIngo Molnar <mingo@kernel.org>
Wed, 22 Aug 2012 09:12:15 +0000 (11:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 22 Aug 2012 09:12:15 +0000 (11:12 +0200)
1  2 
arch/Kconfig
arch/s390/Kconfig

diff --cc arch/Kconfig
Simple merge
Simple merge