From: Linus Torvalds Date: Wed, 16 Dec 2009 18:33:18 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v2.6.33-rc1~59 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=59be2e04e50ac9947e4356c10099f49977f5f74d;p=~emulex%2Finfiniband.git 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 ... --- 59be2e04e50ac9947e4356c10099f49977f5f74d diff --cc MAINTAINERS index 0a32c3ec6b1,256139e0c23..d6a27110a74 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5986,14 -5954,14 +5986,14 @@@ F: drivers/video/backlight/wm83*_bl. F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/wm831x/ F: include/linux/mfd/wm8350/ -F: include/linux/mfd/wm8400/ -F: sound/soc/codecs/wm8350.c -F: sound/soc/codecs/wm8400.c +F: include/linux/mfd/wm8400* +F: sound/soc/codecs/wm8350.* +F: sound/soc/codecs/wm8400.* X.25 NETWORK LAYER - M: Henner Eisen + M: Andrew Hendry L: linux-x25@vger.kernel.org - S: Maintained + S: Odd Fixes F: Documentation/networking/x25* F: include/net/x25* F: net/x25/