Merge branch 'for-v3.16-rc/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-fixes-ti
authorMike Turquette <mturquette@linaro.org>
Wed, 2 Jul 2014 06:41:56 +0000 (23:41 -0700)
committerMike Turquette <mturquette@linaro.org>
Wed, 2 Jul 2014 06:41:56 +0000 (23:41 -0700)

Trivial merge