Merge branches 'sh/hwblk' and 'sh/pm-runtime'
authorPaul Mundt <lethal@linux-sh.org>
Sun, 23 Aug 2009 09:04:07 +0000 (18:04 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 23 Aug 2009 09:04:07 +0000 (18:04 +0900)

Trivial merge