Merge branch 'for-v3.17/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next-ti
authorMike Turquette <mturquette@linaro.org>
Fri, 25 Jul 2014 22:37:40 +0000 (15:37 -0700)
committerMike Turquette <mturquette@linaro.org>
Fri, 25 Jul 2014 22:37:40 +0000 (15:37 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge