Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
authorArnd Bergmann <[email protected]>
Fri, 20 Jul 2012 22:11:16 +0000 (00:11 +0200)
committerArnd Bergmann <[email protected]>
Fri, 20 Jul 2012 22:11:16 +0000 (00:11 +0200)
From Roland Stigge <[email protected]>:
this is a late addition to LPC32xx DTS files for v3.6.

* 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Add PWM to base dts file

Signed-off-by: Arnd Bergmann <[email protected]>

Trivial merge