Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next
authorMike Turquette <mturquette@linaro.org>
Tue, 10 Jun 2014 23:53:25 +0000 (16:53 -0700)
committerMike Turquette <mturquette@linaro.org>
Tue, 10 Jun 2014 23:53:25 +0000 (16:53 -0700)

Trivial merge