Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 6 Sep 2012 23:48:59 +0000 (09:48 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 6 Sep 2012 23:48:59 +0000 (09:48 +1000)
Brings in various bug fixes from 3.6-rcX


Trivial merge