diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 14:55:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 14:55:54 +1100 |
| commit | 02e0d3bc772b8c122fecf6216c6691202f74ae15 (patch) | |
| tree | 49f042ea0f96a232c170e30193fd0000d27a1d30 /MAINTAINERS | |
| parent | d228ef7d5a509afe879d2e43bd46fb50e3ce08e6 (diff) | |
| parent | 2f0760774711c957c395b31131b848043af98edf (diff) | |
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/gadget/Kconfig
drivers/usb/musb/omap2430.c
drivers/usb/phy/omap-usb2.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 22a0702d967d..8a78682946ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8181,9 +8181,10 @@ F: drivers/net/wireless/ath/ar5523/ USB ATTACHED SCSI M: Matthew Wilcox <willy@linux.intel.com> M: Sarah Sharp <sarah.a.sharp@linux.intel.com> +M: Gerd Hoffmann <kraxel@redhat.com> L: linux-usb@vger.kernel.org L: linux-scsi@vger.kernel.org -S: Supported +S: Maintained F: drivers/usb/storage/uas.c USB CDC ETHERNET DRIVER |