From: Tony Lindgren <tony@atomide.com>
Date: Tue, 22 Sep 2009 01:21:58 +0000 (-0700)
Subject: Merge branch 'ehci'
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~22
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480ca551c7e1ccac974341519f95e1ea840a737a;p=pandora-kernel.git

Merge branch 'ehci'

Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3evm.c
	arch/arm/mach-omap2/board-omap3pandora.c
	arch/arm/mach-omap2/usb-ehci.c
	arch/arm/plat-omap/include/mach/omap34xx.h
	arch/arm/plat-omap/include/mach/usb.h
	drivers/usb/host/ehci-omap.c
---

480ca551c7e1ccac974341519f95e1ea840a737a
Reading git-diff-tree failed