diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-25 17:06:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-25 17:06:29 -0400 |
| commit | 126a031e437a4ab56a162e9cff7fc04b9f7efeec (patch) | |
| tree | 8fdf2ffd565a0808827665ce74fe65e35647296b /MAINTAINERS | |
| parent | 01e77706cdde7c0b47e5ca1f4284a795504c7c40 (diff) | |
| parent | 7c9f757319ccf7a47ce167b86eda671c87b5b917 (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: (25 commits)
TIPC: Removed inactive maintainer
isdn: Cleanup Sections in PCMCIA driver elsa
isdn: Cleanup Sections in PCMCIA driver avma1
isdn: Cleanup Sections in PCMCIA driver teles
isdn: Cleanup Sections in PCMCIA driver sedlbauer
via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()
netfilter: xt_hashlimit: IPV6 bugfix
netfilter: ip6table_raw: fix table priority
netfilter: xt_hashlimit: dl_seq_stop() fix
af_key: return error if pfkey_xfrm_policy2msg_prep() fails
skbuff: remove unused dma_head & dma_maps fields
vlan: updates vlan real_num_tx_queues
vlan: adds vlan_dev_select_queue
igb: only use vlan_gro_receive if vlans are registered
igb: do not modify tx_queue_len on link speed change
igb: count Rx FIFO errors correctly
bnx2: Use proper handler during netpoll.
bnx2: Fix netpoll crash.
ksz884x: fix return value of netdev_set_eeprom
cgroups: net_cls as module
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fbc3d653d52b..28d4bf0e483e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5423,7 +5423,6 @@ S: Maintained | |||
| 5423 | F: sound/soc/codecs/twl4030* | 5423 | F: sound/soc/codecs/twl4030* |
| 5424 | 5424 | ||
| 5425 | TIPC NETWORK LAYER | 5425 | TIPC NETWORK LAYER |
| 5426 | M: Per Liden <per.liden@ericsson.com> | ||
| 5427 | M: Jon Maloy <jon.maloy@ericsson.com> | 5426 | M: Jon Maloy <jon.maloy@ericsson.com> |
| 5428 | M: Allan Stephens <allan.stephens@windriver.com> | 5427 | M: Allan Stephens <allan.stephens@windriver.com> |
| 5429 | L: tipc-discussion@lists.sourceforge.net | 5428 | L: tipc-discussion@lists.sourceforge.net |