Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel...

* 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
  ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
  PM / devfreq: update the name of EXYNOS clock registers that were omitted
  PM / devfreq: update the name of EXYNOS clock register
  ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
  ARM: EXYNOS: use static declaration on regarding clock
  ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
  (includes an update to v3.3-rc6)

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/common.h
index f78ec4e6a5c70509a77a6b22173d307f120f9648,7e9338e8d684c7ff442a517be55de218ba34e8c7..4897ec02e7984ac4c9003bb776ca1ac4db94f82b
--- 1/arch/arm/mach-omap2/common.h
--- 2/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@@ -132,9 -132,8 +132,10 @@@ void omap3_map_io(void)
  void am33xx_map_io(void);
  void omap4_map_io(void);
  void ti81xx_map_io(void);
+ void omap_barriers_init(void);
  
 +extern void __init omap_init_consistent_dma_size(void);
 +
  /**
   * omap_test_timeout - busy-loop, testing a condition
   * @cond: condition to test until it evaluates to true

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-omap2/pm.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge