Merge branch 'sh/pci-express-integration'
authorPaul Mundt <lethal@linux-sh.org>
Tue, 7 Sep 2010 08:56:27 +0000 (17:56 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 7 Sep 2010 08:56:27 +0000 (17:56 +0900)

Trivial merge