]> err.no Git - linux-2.6/commitdiff
Merge branch 'x3'
authorPaul Mundt <lethal@linux-sh.org>
Wed, 20 Jun 2007 09:29:27 +0000 (18:29 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 20 Jun 2007 09:29:27 +0000 (18:29 +0900)
1  2 
arch/sh/Kconfig

diff --cc arch/sh/Kconfig
Simple merge