From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 22 Apr 2012 21:26:08 +0000 (+0200)
Subject: Merge branch 'lpc32xx/dt' of git://git.antcom.de/linux-2.6 into next/dt
X-Git-Tag: v3.12-rc1~3158^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22251a9b72c46758254caf3250e6d80ea2b088c8;p=kernel%2Fkernel-generic.git

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

Roland Stigge <stigge@antcom.de> writes:
  this is a rearrangement of all mach-lpc32xx specific patches for device
  tree conversion. Please note that:

  * It builds upon the i2c-pnx changes (see previous pull request, branch
    lpc32xx/i2c)
  * Dave Miller gave permission to merge the lpc_eth.c change via arm-soc
    (patch 1/8)

  The rest of the patches is mach-lpc32xx only.

* 'lpc32xx/dt' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Defconfig update
  ARM: LPC32xx: Move common code to common.c
  ARM: LPC32xx: Device tree support
  ARM: LPC32xx: DTS files for device tree conversion
  ARM: LPC32xx: Remove obsolete platform Kconfig
  ARM: LPC32xx: clock.c registration adjustment
  ARM: LPC32xx: clock.c cleanup
  net: Add device tree support to LPC32xx

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
---

22251a9b72c46758254caf3250e6d80ea2b088c8