]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sh/iomap'
authorPaul Mundt <lethal@linux-sh.org>
Wed, 2 Jun 2010 07:32:12 +0000 (16:32 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 2 Jun 2010 07:32:12 +0000 (16:32 +0900)
1  2 
arch/sh/Kconfig

diff --cc arch/sh/Kconfig
Simple merge