From: Michael Turquette <mturquette@linaro.org>
Date: Mon, 2 Feb 2015 22:59:38 +0000 (-0800)
Subject: Merge branch 'clk-next' into v3.19-rc7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=54eea32f7ed3037c91853924227585b65df909a8;p=linux-beck.git

Merge branch 'clk-next' into v3.19-rc7
---

54eea32f7ed3037c91853924227585b65df909a8
diff --cc MAINTAINERS
index aaa039dee999,2164026b65ee..8fbc5f759a04
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9562,10 -9533,14 +9562,15 @@@ F:	drivers/platform/x86/thinkpad_acpi.
  TI BANDGAP AND THERMAL DRIVER
  M:	Eduardo Valentin <edubezval@gmail.com>
  L:	linux-pm@vger.kernel.org
 -S:	Supported
 +L:	linux-omap@vger.kernel.org
 +S:	Maintained
  F:	drivers/thermal/ti-soc-thermal/
  
+ TI CDCE706 CLOCK DRIVER
+ M:	Max Filippov <jcmvbkbc@gmail.com>
+ S:	Maintained
+ F:	drivers/clk/clk-cdce706.c
+ 
  TI CLOCK DRIVER
  M:	Tero Kristo <t-kristo@ti.com>
  L:	linux-omap@vger.kernel.org