From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 9 Jun 2010 10:15:10 +0000 (+0100)
Subject: Merge branch 'ep93xx' into for-2.6.36
X-Git-Tag: v2.6.36-rc1~493^2~1^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e03a61544c368c2c3ff946c1ce7807e5c36a527;p=pandora-kernel.git

Merge branch 'ep93xx' into for-2.6.36

Trivial add/add fixup required in the clock table.

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

6e03a61544c368c2c3ff946c1ce7807e5c36a527
Reading git-diff-tree failed