diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 00:15:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 00:15:59 +0200 |
| commit | 233de298cb44e7dd300cd68f5abd7f1a75561fd5 (patch) | |
| tree | 2193094046036bec1a05883e63b1af5d9c067397 /drivers/clk | |
| parent | 5e7c2c2f9785be62431270d48e2753e580d6a11c (diff) | |
| parent | c49a18308669a7c1bd61ddd4f575a88d49b0b852 (diff) | |
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>
Diffstat (limited to 'drivers/clk')
0 files changed, 0 insertions, 0 deletions