Merge remote-tracking branch 'linaro/clk-next' into clk-next

diff --cc Documentation/devicetree/bindings/clock/exynos5250-clock.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/cros5250-common.dtsi
index 9b186ac06c8ba2fbeff30f9bd58f6ca797e1b05d,c33a01eda52aa518eb419ffa46955d8300509812..0c30ca2dd152afc420b25bfea6cc5f560de1595f
--- 1/arch/arm/boot/dts/cros5250-common.dtsi
--- 2/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@@ -42,12 -35,8 +42,13 @@@
  
                max77686@09 {
                        compatible = "maxim,max77686";
 +                      interrupt-parent = <&gpx3>;
 +                      interrupts = <2 0>;
 +                      pinctrl-names = "default";
 +                      pinctrl-0 = <&max77686_irq>;
 +                      wakeup-source;
                        reg = <0x09>;
+                       #clock-cells = <1>;
  
                        voltage-regulators {
                                ldo1_reg: LDO1 {

diff --cc drivers/media/platform/omap3isp/isp.c
Simple merge