From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 2 May 2012 15:13:39 +0000 (+0200)
Subject: Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next... 
X-Git-Tag: firefly_0821_release~3680^2~2752^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=473a37e86350c2b502044db0d22bdf36fd5d3302;p=firefly-linux-kernel-4.4.55.git

Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig

ARM i.MX defconfig updates for 3.5

* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v6_v7_defconfig: Add SPI NOR support
  ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
---

473a37e86350c2b502044db0d22bdf36fd5d3302