From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 Mar 2012 22:40:37 +0000 (+0000)
Subject: Merge branch 'imx/defconfig' into next/drivers
X-Git-Tag: v3.4-rc1~86^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc026f21e2acdcea8640df5da470c6fdca92911;p=pandora-kernel.git

Merge branch 'imx/defconfig' into next/drivers

Conflicts:
	arch/arm/configs/imx_v6_v7_defconfig

Resolves one conflict with an earlier branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

7cc026f21e2acdcea8640df5da470c6fdca92911
Reading git-diff-tree failed