Merge branch 'omap-for-v3.17/prcm-v2' into omap-for-v3.18/tmp-merge-2014-09-29
authorTony Lindgren <tony@atomide.com>
Mon, 29 Sep 2014 18:38:52 +0000 (11:38 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 29 Sep 2014 18:38:52 +0000 (11:38 -0700)

Trivial merge