From: Alexander Graf <agraf@suse.de>
Date: Wed, 28 Aug 2013 22:41:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kvm-ppc-next
X-Git-Tag: v3.12-rc1~143^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf550fc93d9855872a95e69e4002256110d89858;p=pandora-kernel.git

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

Conflicts:
	mm/Kconfig

CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
---

bf550fc93d9855872a95e69e4002256110d89858
Reading git-diff-tree failed