Merge branch 'master' into sh/smp
authorPaul Mundt <lethal@linux-sh.org>
Tue, 1 Sep 2009 04:54:14 +0000 (13:54 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 1 Sep 2009 04:54:14 +0000 (13:54 +0900)
Conflicts:
arch/sh/mm/cache-sh4.c


Trivial merge