From: Olof Johansson <olof@lixom.net>
Date: Mon, 5 Nov 2012 18:27:09 +0000 (-0800)
Subject: Merge branch 'depends/omap-cleanup-headers-usb' into next/headers
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~51^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=365480d67bfa6a3205708d20035abee4d422ee5b;p=pandora-kernel.git

Merge branch 'depends/omap-cleanup-headers-usb' into next/headers

Conflicts resolved same as Tony did in his later dependent branch:

	arch/arm/mach-omap1/clock.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-cm-t35.c
	arch/arm/mach-omap2/board-igep0020.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/board-rm680.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/twl-common.c
	arch/arm/mach-omap2/usb-host.c
	arch/arm/mach-omap2/usb-musb.c

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

365480d67bfa6a3205708d20035abee4d422ee5b
Reading git-diff-tree failed