Merge tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code into next/dt

From Tony Prisk:

Update arch-vt8500 and drivers to device tree and
remove existing non-dt code.

* tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code:
  arm: vt8500: Update arch-vt8500 to devicetree support.
  arm: vt8500: gpio: Devicetree support for arch-vt8500
  arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
  arm: vt8500: clk: Add Common Clock Framework support
  video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
  serial: vt8500: Add devicetree support for vt8500-serial
  rtc: vt8500: Add devicetree support for vt8500-rtc
  arm: vt8500: Add device tree files for VIA/Wondermedia SoC's

Resolved add/change conflict in drivers/clk/Makefile.

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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/clk/Makefile
index 6327536b4900ae5e06d8da313af721c9dc4b9c4a,42fb17367f7867f01530590780045283b5c8fe44..e48e0da5a88467cd4d9fa45600355f15f10caf1a
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -9,13 -9,8 +9,14 @@@ obj-$(CONFIG_ARCH_MXS)         += mxs
  obj-$(CONFIG_ARCH_SOCFPGA)    += socfpga/
  obj-$(CONFIG_PLAT_SPEAR)      += spear/
  obj-$(CONFIG_ARCH_U300)               += clk-u300.o
 -obj-$(CONFIG_ARCH_INTEGRATOR) += versatile/
 +obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
 +obj-$(CONFIG_ARCH_PRIMA2)     += clk-prima2.o
 +ifeq ($(CONFIG_COMMON_CLK), y)
 +obj-$(CONFIG_ARCH_MMP)                += mmp/
 +endif
 +obj-$(CONFIG_MACH_LOONGSON1)  += clk-ls1x.o
 +obj-$(CONFIG_ARCH_U8500)      += ux500/
+ obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
  
  # Chip specific
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o