Merge remote-tracking branch 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 31 Jul 2012 05:18:31 +0000 (15:18 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 31 Jul 2012 05:18:31 +0000 (15:18 +1000)
Kumar says:

"A few patches that missed the initial 3.6 window.  These are bug fixes at
this point."


Trivial merge