Merge branch 'for-v3.17-rc/ti-clk-dt' of github.com:t-kristo/linux-pm into fixes-rc3
authorTony Lindgren <tony@atomide.com>
Wed, 3 Sep 2014 21:39:51 +0000 (14:39 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 3 Sep 2014 21:39:51 +0000 (14:39 -0700)

Trivial merge