Merge branch 'master' into sh/hwblk
authorPaul Mundt <lethal@linux-sh.org>
Sat, 15 Aug 2009 04:00:02 +0000 (13:00 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sat, 15 Aug 2009 04:00:02 +0000 (13:00 +0900)

Trivial merge