Merge remote-tracking branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 1 Sep 2011 05:57:23 +0000 (15:57 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 1 Sep 2011 05:57:32 +0000 (15:57 +1000)
commit7bfb40b048aa709bb88a00a1acbadbd9f7a645ee
tree88cfef3d3facca564ad378553a838789e0c78cb1
parent9bb7361d99fb5c510e62b521e4292581fa1bee98
parent9e79e3e9dd9672b37ac9412e9a926714306551fe
Merge remote-tracking branch 'origin/master' into next

(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)