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

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

Conflicts:
	drivers/usb/musb/blackfin.c
	drivers/usb/musb/musb_core.c
	drivers/usb/musb/musb_core.h
---

34a734742c8e91ff90e0cbb32291a948064436b0
Reading git-diff-tree failed