commit 365480d67bfa6a3205708d20035abee4d422ee5b
author Olof Johansson <olof@lixom.net> Mon Nov 05 10:27:09 2012 -0800
committer Olof Johansson <olof@lixom.net> Mon Nov 05 10:27:33 2012 -0800
tree e58aba813aa1d040b98355325459ec8ad1c6a4e6
parent 1c7ebf17a4d874fe38226a4f5990cb7be702e331
parent e8c4a7acc9ec0ee82feedcdc3c6d0ee44d67918a

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>