From: Tony Lindgren <tony@atomide.com>
Date: Wed, 22 Dec 2010 01:32:36 +0000 (-0800)
Subject: Merge branch 'musb-hw' of git://gitorious.org/usb/usb into tmp-rebuild-1292981503
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1288d1b8a3c04e77fd1164ecfbe6d76cf0399f1;p=pandora-kernel.git

Merge branch 'musb-hw' of git://gitorious.org/usb/usb into tmp-rebuild-1292981503

Conflicts:
	arch/arm/mach-omap2/Kconfig
	drivers/usb/gadget/composite.c
	drivers/usb/musb/blackfin.c
	drivers/usb/musb/musb_core.c
	drivers/usb/musb/musb_core.h
---

a1288d1b8a3c04e77fd1164ecfbe6d76cf0399f1
Reading git-diff-tree failed