git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9eb3430 ed67ea8)
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)
Trivial add/add fixup required in the clock table.

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


Trivial merge
Pandora Kernel Repository