tree 29253331da9680b5f81ba8715202044f45861666
parent 9eb34302681d3f6cf0b186aae31ba08cbd5f22fb
parent ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1276078510 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1276078510 +0100

Merge branch 'ep93xx' into for-2.6.36

Trivial add/add fixup required in the clock table.

Conflicts:
	arch/arm/mach-ep93xx/clock.c