Merge branch 'next/dt' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:23:11 +0000 (14:23 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:23:11 +0000 (14:23 -0700)
commit7e95c548818d2b311090848083277fb907cfb56d
tree86fecf07ae1f01ba8bac5969974a7915b738baee
parent6d55d5968a8622f3ea20ec40737aea1cfba6438c
parent99261fbad0a16f105b262d7525801697588ba526
Merge branch 'next/dt' into HEAD

Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
17 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/Kconfig
arch/arm/boot/dts/imx27-phytec-phycore.dts
arch/arm/mach-dove/common.c
arch/arm/mach-imx/Makefile
arch/arm/mach-mmp/mmp2.c
arch/arm/mach-mmp/pxa910.c
arch/arm/mach-mxs/mach-mxs.c
arch/arm/mach-omap2/omap4-common.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
arch/arm/plat-omap/omap_device.c
drivers/clk/Makefile
drivers/gpio/gpio-samsung.c