Merge remote-tracking branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 Sep 2011 03:51:04 +0000 (13:51 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 Sep 2011 05:52:38 +0000 (15:52 +1000)
(Merge in order to get the PCIe mps/mrss code fixes)


Trivial merge