From: Gleb Natapov <gleb@redhat.com>
Date: Mon, 4 Nov 2013 08:20:57 +0000 (+0200)
Subject: Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
X-Git-Tag: v3.13-rc1~80^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95f328d3ad1a8e4e3175a18546fb35c495e31130;p=pandora-kernel.git

Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue

Conflicts:
	arch/powerpc/include/asm/processor.h
---

95f328d3ad1a8e4e3175a18546fb35c495e31130
Reading git-diff-tree failed