From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 20 Jul 2012 22:15:59 +0000 (+0200)
Subject: Merge branch 'lpc32xx/core2' of git://git.antcom.de/linux-2.6 into next/soc
X-Git-Tag: v3.6-rc1~146^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=233de298cb44e7dd300cd68f5abd7f1a75561fd5;p=pandora-kernel.git

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

From Roland Stigge <stigge@antcom.de>:
this LPC32xx core update (branch lpc32xx/core2) builds upon the
previously provided lpc32xx/core-fixes. Basically including PWM support
(for the PWM driver from Alexandre already in the pwm tree), and
CPU ID.

* 'lpc32xx/core2' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Add PWM support
  ARM: LPC32xx: Add PWM clock
  ARM: LPC32xx: Set system serial based on cpu unique id

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

233de298cb44e7dd300cd68f5abd7f1a75561fd5
Reading git-diff-tree failed