From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 2 Nov 2011 01:46:55 +0000 (+0100)
Subject: Merge branch 'imx/imx6q' into next/soc
X-Git-Tag: v3.2-rc1~88^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abc3f126ac736280c68db6472eb0040ddf6e1b1f;p=pandora-kernel.git

Merge branch 'imx/imx6q' into next/soc

Conflicts:
	Documentation/devicetree/bindings/arm/fsl.txt
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/plat-mxc/include/mach/common.h
---

abc3f126ac736280c68db6472eb0040ddf6e1b1f
Reading git-diff-tree failed