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

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

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

f306749fced39b0c71d191ca53a1d4350477df64
Reading git-diff-tree failed