Merge branches 'sh/ftrace' and 'sh/cachetlb'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 6 Jul 2009 11:19:28 +0000 (20:19 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 6 Jul 2009 11:19:28 +0000 (20:19 +0900)
1  2 
arch/sh/Kconfig

diff --cc arch/sh/Kconfig
Simple merge