| commit | 06b851e58b73a268f8092c2d990f697b2e7c53bd | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Apr 02 18:33:58 2013 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Apr 02 18:33:58 2013 -0700 |
| tree | a44e10462a39202b60636f8b102376a9c69169c1 | |
| parent | 5f03dc2002f5dc85ce87e69caff7f28f17f5c9b2 [diff] | |
| parent | 17e7979f83c1de305fa81efb0aa7a3a56bd8121c [diff] |
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