Merge branches 'sh/smp' and 'sh/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Tue, 8 Sep 2009 07:27:31 +0000 (16:27 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 8 Sep 2009 07:27:31 +0000 (16:27 +0900)

Trivial merge