From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 19 Jul 2009 19:28:11 +0000 (+0900)
Subject: Merge branches 'sh/hwblk' and 'sh/platform-updates'
X-Git-Tag: v2.6.32-rc1~640^2~92
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c358fc46efa6b8a03cf007e7250b4b0020950d0a;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'sh/hwblk' and 'sh/platform-updates'
---

c358fc46efa6b8a03cf007e7250b4b0020950d0a