From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:23:11 +0000 (-0700)
Subject: Merge branch 'next/dt' into HEAD
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e95c548818d2b311090848083277fb907cfb56d;p=pandora-kernel.git

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
---

7e95c548818d2b311090848083277fb907cfb56d
Reading git-diff-tree failed