From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Nov 2012 02:22:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
X-Git-Tag: next-20121112~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69ab41cb9da090fbdaab11e0cd58e78ebe48c1b0;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild
	arch/powerpc/include/uapi/asm/epapr_hcalls.h
---

69ab41cb9da090fbdaab11e0cd58e78ebe48c1b0