| commit | 6e03a61544c368c2c3ff946c1ce7807e5c36a527 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Jun 09 11:15:10 2010 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Jun 09 11:15:10 2010 +0100 |
| tree | 29253331da9680b5f81ba8715202044f45861666 | |
| parent | 9eb34302681d3f6cf0b186aae31ba08cbd5f22fb [diff] | |
| parent | ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b [diff] |
Merge branch 'ep93xx' into for-2.6.36 Trivial add/add fixup required in the clock table. Conflicts: arch/arm/mach-ep93xx/clock.c