Merge tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code into next/dt
authorOlof Johansson <olof@lixom.net>
Mon, 24 Sep 2012 04:51:39 +0000 (21:51 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 24 Sep 2012 04:51:39 +0000 (21:51 -0700)
commitdb404e72bb5432c886ff0ea42e7b31d16be0c837
tree91cf9618fa0b5233115abe6863d2f8a36390c050
parent40169a7c399346281da55ed9905a104d3da47945
parente9a91de7602a0a6999f23a2981db68b69aa695a7
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>
arch/arm/Kconfig
drivers/clk/Makefile