Merge branch 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Fri, 16 Oct 2009 06:14:50 +0000 (15:14 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 16 Oct 2009 06:14:50 +0000 (15:14 +0900)
Conflicts:
arch/sh/mm/cache-sh4.c


Trivial merge