Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Mon, 13 Dec 2010 06:35:10 +0000 (15:35 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 13 Dec 2010 06:35:10 +0000 (15:35 +0900)
1  2  3 
arch/sh/Kconfig

diff --cc arch/sh/Kconfig
Simple merge