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)
commit1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22
tree493477b7a19606c66de2f003bca83672f2164cad
parentc26afe9e8591f306d79aab8071f1d34e4f60b700
parent9d037a777695993ec7437e5f451647dea7919d4c
Merge remote-tracking branch 'origin/master' into next

(Merge in order to get the PCIe mps/mrss code fixes)