]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitefa569ed5d3fd481f4cfff2642f127479c516d28
tree29253331da9680b5f81ba8715202044f45861666
parenta8fa76de0be996695b527968b198d46f637e7303
parent38832752b338a61c0196e1cc70b67feea24ee41a
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