Merge branch 'for-v3.17-rc/ti-clk-driver' of github.com:t-kristo/linux-pm into clk...
authorMike Turquette <mturquette@linaro.org>
Wed, 3 Sep 2014 17:07:14 +0000 (10:07 -0700)
committerMike Turquette <mturquette@linaro.org>
Wed, 3 Sep 2014 17:07:14 +0000 (10:07 -0700)

Trivial merge