From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 17 Jul 2011 19:43:26 +0000 (+0200)
Subject: Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.1-rc1~153^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4;p=pandora-kernel.git

Merge branch 'zynq/master' of git+ssh:///linux/kernel/git/arm/linux-arm-soc into next/soc

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
---

3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4
Reading git-diff-tree failed