Merge branch 'sh/hwblk' into sh/pm-runtime
authorPaul Mundt <lethal@linux-sh.org>
Sun, 23 Aug 2009 09:02:59 +0000 (18:02 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 23 Aug 2009 09:02:59 +0000 (18:02 +0900)

Trivial merge