From: Olof Johansson <olof@lixom.net>
Date: Thu, 22 Dec 2011 17:23:16 +0000 (-0800)
Subject: Merge branch 'omap/fixes-non-critical-part2' into next/fixes-non-critical
X-Git-Tag: firefly_0821_release~3680^2~3797^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f;p=firefly-linux-kernel-4.4.55.git

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
---

bcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f