diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 23:59:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 23:59:02 +0200 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /MAINTAINERS | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | can: fix SJA1000 dlc for RTR packets (diff) | |
| download | linux-7143b7d41218d4fc2ea33e6056c73609527ae687.tar.xz linux-7143b7d41218d4fc2ea33e6056c73609527ae687.zip | |
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 F: drivers/usb/host/uhci* USB "USBNET" DRIVER FRAMEWORK -M: David Brownell <dbrownell@users.sourceforge.net> +M: Oliver Neukum <oneukum@suse.de> L: netdev@vger.kernel.org W: http://www.linux-usb.org/usbnet S: Maintained |