diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:33:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:33:18 -0800 |
| commit | 59be2e04e50ac9947e4356c10099f49977f5f74d (patch) | |
| tree | 56aa00a4499a1543da8728cb84b10bec5b211280 /MAINTAINERS | |
| parent | e69381b4175ba162229646f6753ff1d87c24d468 (diff) | |
| parent | 503914cf4a4b5dbe3f844e0a92f412ae99fde70e (diff) | |
| download | linux-59be2e04e50ac9947e4356c10099f49977f5f74d.tar.gz linux-59be2e04e50ac9947e4356c10099f49977f5f74d.tar.bz2 linux-59be2e04e50ac9947e4356c10099f49977f5f74d.zip | |
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: (26 commits)
net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2
ixgbe: allow tx of pre-formatted vlan tagged packets
ixgbe: Fix 82598 premature copper PHY link indicatation
ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters
bcm63xx_enet: fix compilation failure after get_stats_count removal
packet: dont call sleeping functions while holding rcu_read_lock()
tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
ipvs: zero usvc and udest
netfilter: fix crashes in bridge netfilter caused by fragment jumps
ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
sky2: leave PCI config space writeable
sky2: print Optima chip name
x25: Update maintainer.
ipvs: fix synchronization on connection close
netfilter: xtables: document minimal required version
drivers/net/bonding/: : use pr_fmt
can: CAN_MCP251X should depend on HAS_DMA
drivers/net/usb: Correct code taking the size of a pointer
drivers/net/cpmac.c: Correct code taking the size of a pointer
drivers/net/sfc: Correct code taking the size of a pointer
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0a32c3ec6b1c..d6a27110a747 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5991,9 +5991,9 @@ F: sound/soc/codecs/wm8350.* F: sound/soc/codecs/wm8400.* X.25 NETWORK LAYER -M: Henner Eisen <eis@baty.hanse.de> +M: Andrew Hendry <andrew.hendry@gmail.com> L: linux-x25@vger.kernel.org -S: Maintained +S: Odd Fixes F: Documentation/networking/x25* F: include/net/x25* F: net/x25/ |