Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Jan 2013 00:33:37 +0000 (11:33 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Jan 2013 00:33:37 +0000 (11:33 +1100)
Merge "merge" branch to bring in various bug fixes that are
going into 3.8


Trivial merge