From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 May 2012 19:19:31 +0000 (-0700)
Subject: Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.12-rc1~3078
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0877aa3908aaeeae8fc2850691668c4315d3db56;p=kernel%2Fkernel-generic.git

Merge tag 'defconfig' of git://git./linux/kernel/git/arm/arm-soc

Pull arm-soc defconfig updates from Olof Johansson:
 "For the first time, we have one branch that collects just updates to
  defconfig files, mostly for adapting to changes in other subsystems."

* tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII
  ARM: tegra: update defconfig
  ARM: tegra: update defconfig
  ARM: imx_v6_v7_defconfig: Add SPI NOR support
  ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default
---

0877aa3908aaeeae8fc2850691668c4315d3db56