Merge branch 'ep93xx' into for-2.6.36

Trivial add/add fixup required in the clock table.

Conflicts:
	arch/arm/mach-ep93xx/clock.c
This commit is contained in:
Mark Brown 2010-06-09 11:15:10 +01:00
commit 6e03a61544
4 changed files with 146 additions and 1 deletions