From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 27 Apr 2009 00:45:43 +0000 (+0900)
Subject: Merge branches 'sh/stable-updates' and 'sh/pci-rework'
X-Git-Tag: v2.6.31-rc1~392^2~41^2~124
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=339b042bb408877dcb734d896cdb52dd20600aab;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'sh/stable-updates' and 'sh/pci-rework'
---

339b042bb408877dcb734d896cdb52dd20600aab