diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-22 09:23:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-22 09:23:16 -0800 |
| commit | bcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f (patch) | |
| tree | f87d60de121378312babf3a471315a6a5e88fe97 /arch/arm/mach-s3c2440/clock.c | |
| parent | 53bf82ce766b17436a6e9c672f9fa29702f3731e (diff) | |
| parent | 30c95692f62a40170833e87f3cd50fcbfe87c1a2 (diff) | |
Merge branch 'omap/fixes-non-critical-part2' into next/fixes-non-critical
* 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
Diffstat (limited to 'arch/arm/mach-s3c2440/clock.c')
0 files changed, 0 insertions, 0 deletions