Merge branches 'sh/highmem' and 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Fri, 2 Jul 2010 04:05:10 +0000 (13:05 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 2 Jul 2010 04:05:10 +0000 (13:05 +0900)

Trivial merge