Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 27 Aug 2013 05:03:30 +0000 (15:03 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 27 Aug 2013 05:03:30 +0000 (15:03 +1000)
Merge stuff that already went into Linus via "merge" which
are pre-reqs for subsequent patches


Trivial merge