Merge branch 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Fri, 16 Oct 2009 09:16:02 +0000 (18:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 16 Oct 2009 09:16:02 +0000 (18:16 +0900)
Conflicts:
arch/sh/Kconfig


Trivial merge