diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 17:59:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 17:59:02 -0400 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /MAINTAINERS | |
| parent | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (diff) | |
| parent | 87e9af6cc67d842cd92b52b81f3f14e665e7ab05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 17c0917a26ea..e653a99ddc4c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6551,7 +6551,7 @@ S: Maintained | |||
| 6551 | F: drivers/usb/host/uhci* | 6551 | F: drivers/usb/host/uhci* |
| 6552 | 6552 | ||
| 6553 | USB "USBNET" DRIVER FRAMEWORK | 6553 | USB "USBNET" DRIVER FRAMEWORK |
| 6554 | M: David Brownell <dbrownell@users.sourceforge.net> | 6554 | M: Oliver Neukum <oneukum@suse.de> |
| 6555 | L: netdev@vger.kernel.org | 6555 | L: netdev@vger.kernel.org |
| 6556 | W: http://www.linux-usb.org/usbnet | 6556 | W: http://www.linux-usb.org/usbnet |
| 6557 | S: Maintained | 6557 | S: Maintained |