From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 24 Dec 2009 06:16:41 +0000 (+0900)
Subject: Merge branches 'sh/g3-prep' and 'sh/stable-updates'
X-Git-Tag: v2.6.34-rc1~285^2~151
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=17eb9d62828c3688f41f31ac00d7fee6da9675bf;p=linux-block.git

Merge branches 'sh/g3-prep' and 'sh/stable-updates'
---

17eb9d62828c3688f41f31ac00d7fee6da9675bf