From: Benjamin Herrenschmidt Date: Fri, 11 Oct 2013 07:23:53 +0000 (+1100) Subject: Merge branch 'for-kvm' into next X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~19^2~46 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad26e5c4459d3793ad65bc8929037c70515df83;p=pandora-kernel.git Merge branch 'for-kvm' into next 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 --- 3ad26e5c4459d3793ad65bc8929037c70515df83 Reading git-diff-tree failed