From: Olof Johansson <olof@lixom.net>
Date: Wed, 3 Apr 2013 01:33:58 +0000 (-0700)
Subject: Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~68^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06b851e58b73a268f8092c2d990f697b2e7c53bd;p=pandora-kernel.git

Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc

* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: (604 commits)
  ARM: LPC32xx: defconfig update: Cleanup (EXPERIMENTAL)
  ARM: LPC32xx: defconfig update: Remove the museum NAND option
  ARM: LPC32xx: defconfig update: Default drivers and cleanup
  ARM: LPC32xx: defconfig update: gpio and keys
  + Linux 3.9-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/Kconfig
---

06b851e58b73a268f8092c2d990f697b2e7c53bd
Reading git-diff-tree failed