Merge branches 'sh/hwblk' and 'sh/platform-updates'
authorPaul Mundt <lethal@linux-sh.org>
Sun, 19 Jul 2009 19:28:11 +0000 (04:28 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 19 Jul 2009 19:28:11 +0000 (04:28 +0900)

Trivial merge