diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 22:44:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 22:44:07 -0500 |
| commit | 75ef7cdda2daa35be9e070ac8e5258759ac03d06 (patch) | |
| tree | fc7838e872b182cf6c061a681881c9c5a406489e /MAINTAINERS | |
| parent | be64c970f601d5bb439b6cc88ea2bd208b3422a0 (diff) | |
| parent | c4d49794ff2838038fd9756eae39c39a5a685833 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net: bug fix for vlan + gro issue
tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
IPv6: better document max_addresses parameter
MAINTAINERS: update mv643xx_eth maintenance status
e1000: Fix DMA mapping error handling on RX
iwlwifi: sanity check before counting number of tfds can be free
iwlwifi: error checking for number of tfds in queue
iwlwifi: set HT flags after channel in rxon
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c95f727236e1..2533fc45a44a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3489,9 +3489,9 @@ S: Maintained | |||
| 3489 | F: drivers/net/wireless/libertas/ | 3489 | F: drivers/net/wireless/libertas/ |
| 3490 | 3490 | ||
| 3491 | MARVELL MV643XX ETHERNET DRIVER | 3491 | MARVELL MV643XX ETHERNET DRIVER |
| 3492 | M: Lennert Buytenhek <buytenh@marvell.com> | 3492 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
| 3493 | L: netdev@vger.kernel.org | 3493 | L: netdev@vger.kernel.org |
| 3494 | S: Supported | 3494 | S: Maintained |
| 3495 | F: drivers/net/mv643xx_eth.* | 3495 | F: drivers/net/mv643xx_eth.* |
| 3496 | F: include/linux/mv643xx.h | 3496 | F: include/linux/mv643xx.h |
| 3497 | 3497 | ||