Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git...

From Kukjin Kim:
Just adding camif gpio setup and clkdev.

* 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: Add clkdev entry for camif-upll clock
  ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
  + Linux 3.7-rc6

Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c
include/linux/clk-provider.h, resolved as in other branches.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/tegra30.dtsi
Simple merge

diff --cc arch/arm/mach-highbank/system.c
index 194a5bbb73634c9f55238e27aa002635d51d2bac,86e37cd9376cc7a522a17a65ca39cc127dd7deeb..aed96ad9bd4a7ddf8a7f2f544ca03e6d3f14a5bb
--- 1/arch/arm/mach-highbank/system.c
--- 2/arch/arm/mach-highbank/system.c
+++ b/arch/arm/mach-highbank/system.c
@@@ -26,6 -27,8 +26,7 @@@ void highbank_restart(char mode, const 
        else
                hignbank_set_pwr_soft_reset();
  
-       cpu_do_idle();
 -      scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
+       while (1)
+               cpu_do_idle();
  }
  

diff --cc arch/arm/mach-imx/ehci-imx25.c
Simple merge

diff --cc arch/arm/mach-imx/ehci-imx35.c
Simple merge

diff --cc drivers/clk/ux500/u8500_clk.c
Simple merge

diff --cc include/linux/clk-provider.h
index 0dce3d31eae5e43f32a138f54ff3533d3a22ec9b,f9f5e9eeb9dd1f37f59cc95cf1da0cdbd91b7001..172d5bdaf03d335437d8ea53fffa9578960cea8c
--- 1/include/linux/clk-provider.h
--- 2/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@@ -339,11 -335,11 +339,11 @@@ const char *__clk_get_name(struct clk *
  struct clk_hw *__clk_get_hw(struct clk *clk);
  u8 __clk_get_num_parents(struct clk *clk);
  struct clk *__clk_get_parent(struct clk *clk);
- inline unsigned int __clk_get_enable_count(struct clk *clk);
- inline unsigned int __clk_get_prepare_count(struct clk *clk);
 -int __clk_get_enable_count(struct clk *clk);
 -int __clk_get_prepare_count(struct clk *clk);
++unsigned int __clk_get_enable_count(struct clk *clk);
++unsigned int __clk_get_prepare_count(struct clk *clk);
  unsigned long __clk_get_rate(struct clk *clk);
  unsigned long __clk_get_flags(struct clk *clk);
 -int __clk_is_enabled(struct clk *clk);
 +bool __clk_is_enabled(struct clk *clk);
  struct clk *__clk_lookup(const char *name);
  
  /*