Merge branch 'ep93xx' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Jun 2010 10:15:10 +0000 (11:15 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Jun 2010 10:15:10 +0000 (11:15 +0100)
commit6e03a61544c368c2c3ff946c1ce7807e5c36a527
tree29253331da9680b5f81ba8715202044f45861666
parent9eb34302681d3f6cf0b186aae31ba08cbd5f22fb
parented67ea82c0d9a163458dc6a69a7a3123db1a8b3b
Merge branch 'ep93xx' into for-2.6.36

Trivial add/add fixup required in the clock table.

Conflicts:
arch/arm/mach-ep93xx/clock.c
arch/arm/mach-ep93xx/clock.c
arch/arm/mach-ep93xx/core.c
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
arch/arm/mach-ep93xx/include/mach/platform.h