Merge branch 'sh/highmem'
authorPaul Mundt <lethal@linux-sh.org>
Thu, 13 May 2010 08:48:13 +0000 (17:48 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 13 May 2010 08:48:13 +0000 (17:48 +0900)
1  2 
arch/sh/Kconfig

diff --cc arch/sh/Kconfig
Simple merge