Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
authorOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 21:58:39 +0000 (14:58 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 21:58:39 +0000 (14:58 -0700)
* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Defconfig update


Trivial merge