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

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

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

2e8823ef4fab881317e3301cae307bc3427d0514
Reading git-diff-tree failed