Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Tue, 31 May 2011 04:10:26 +0000 (13:10 +0900)]
1  2 
arch/sh/Kconfig

diff --cc arch/sh/Kconfig
Simple merge