Merge branch 'for-kvm' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 11 Oct 2013 07:23:53 +0000 (18:23 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 11 Oct 2013 07:23:53 +0000 (18:23 +1100)
Topic branch for commits that the KVM tree might want to pull
in separately.

Hand merged a few files due to conflicts with the LE stuff

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Trivial merge