From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 30 Oct 2012 16:38:55 +0000 (-0700)
Subject: Merge tag 'fixes-for-v3.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=169b245a726ad577a2b66b5c0a608f4633715342;p=linux-edison.git

Merge tag 'fixes-for-v3.7-rc4' of git://git./linux/kernel/git/balbi/usb into usb-linus

usb: fixes for v3.7-rc4

We're reverting MUSB Mode 1 DMA patch which caused many regressions. Meanwhile
Roger is cooking a better version of that patch, which will hopefully be ready
for v3.8 merge window.

We also fix an undeclared error in ux5000_remove() and another build error
when we try to build USB_MUSB_OMAP2PLUS as a module.
---

169b245a726ad577a2b66b5c0a608f4633715342