| commit | a7e4c6a7145ee375a688e1701ae4c975d6c6419a | [log] [tgz] |
|---|---|---|
| author | Roland Stigge <stigge@antcom.de> | Tue Mar 13 21:15:40 2012 +0100 |
| committer | Roland Stigge <stigge@antcom.de> | Tue Mar 13 21:15:40 2012 +0100 |
| tree | 0438b5b99a88ec694bb5a91c8ca0cb52fec928f1 | |
| parent | 73d43d00649985cf6509b4f99a720665f1b7c559 [diff] | |
| parent | 678a0222edc9da43a22145d68647500ee85e6c04 [diff] |
Merge branch 'lpc32xx/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into lpc32xx/tmp Conflicts: arch/arm/mach-lpc32xx/clock.c