Merge branch 'omap/fixes-non-critical-part2' into next/fixes-non-critical

Browse source

* omap/fixes-non-critical-part2:
  ARM: OMAP4: clock: Add CPU local timer clock node
  ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported
  ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data

...

This commit is contained in:

Olof Johansson 2011-12-22 09:23:16 -08:00

parent 53bf82ce76 30c95692f6

commit bcdbbe3d45

3 changed files with 92 additions and 55 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

arch/arm/mach-omap2/clock44xx_data.c

View file

98

arch/arm/mach-omap2/omap_hwmod.c

View file

40

arch/arm/mach-omap2/voltagedomains3xxx_data.c

View file