From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Mon, 29 Oct 2012 21:15:32 +0000 (-0200)
Subject: Merge remote-tracking branch 'master' into queue
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~27^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19bf7f8ac3f8131100027281c495dbbe00cd5ae0;p=pandora-kernel.git

Merge remote-tracking branch 'master' into queue

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/asm/kvm_para.h

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

19bf7f8ac3f8131100027281c495dbbe00cd5ae0
Reading git-diff-tree failed