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: (24 commits) usbnet: Remove over-broad module alias from zaurus. MAINTAINERS: drop Michael from bfin_mac driver net/can: activate bit-timing calculation and netlink based drivers by default rionet: fix NULL pointer dereference in rionet_remove net+crypto: Use vmalloc for zlib inflate buffers. netfilter: Fix ip_route_me_harder triggering ip_rt_bug ipv4: Fix IPsec slowpath fragmentation problem ipv4: Fix packet size calculation in __ip_append_data cxgb3: skb_record_rx_queue now records the queue index relative to the net_device. bridge: Only flood unregistered groups to routers qlge: Add maintainer. MAINTAINERS: mark socketcan-core lists as subscribers-only MAINTAINERS: Remove Sven Eckelmann from BATMAN ADVANCED r8169: fix wrong register use. net/usb/kalmia: signedness bug in kalmia_bind() net/usb: kalmia: Various fixes for better support of non-x86 architectures. rtl8192cu: Fix missing firmware load udp/recvmsg: Clear MSG_TRUNC flag when starting over for a new packet ipv6/udp: Use the correct variable to determine non-blocking condition netconsole: fix build when CONFIG_NETCONSOLE_DYNAMIC is turned on ...
Showing
- MAINTAINERS 3 additions, 4 deletionsMAINTAINERS
- crypto/deflate.c 3 additions, 4 deletionscrypto/deflate.c
- crypto/zlib.c 3 additions, 4 deletionscrypto/zlib.c
- drivers/net/Kconfig 2 additions, 1 deletiondrivers/net/Kconfig
- drivers/net/bnx2x/bnx2x_main.c 3 additions, 3 deletionsdrivers/net/bnx2x/bnx2x_main.c
- drivers/net/can/Kconfig 2 additions, 2 deletionsdrivers/net/can/Kconfig
- drivers/net/cxgb3/sge.c 2 additions, 2 deletionsdrivers/net/cxgb3/sge.c
- drivers/net/ppp_deflate.c 2 additions, 3 deletionsdrivers/net/ppp_deflate.c
- drivers/net/r8169.c 1 addition, 1 deletiondrivers/net/r8169.c
- drivers/net/rionet.c 15 additions, 13 deletionsdrivers/net/rionet.c
- drivers/net/usb/kalmia.c 25 additions, 17 deletionsdrivers/net/usb/kalmia.c
- drivers/net/usb/zaurus.c 0 additions, 10 deletionsdrivers/net/usb/zaurus.c
- drivers/net/wireless/rtlwifi/pci.c 12 additions, 1 deletiondrivers/net/wireless/rtlwifi/pci.c
- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c 20 additions, 0 deletionsdrivers/net/wireless/rtlwifi/rtl8192cu/sw.c
- net/bluetooth/hci_conn.c 3 additions, 3 deletionsnet/bluetooth/hci_conn.c
- net/bluetooth/l2cap_core.c 15 additions, 6 deletionsnet/bluetooth/l2cap_core.c
- net/bridge/br_multicast.c 4 additions, 1 deletionnet/bridge/br_multicast.c
- net/ipv4/ip_output.c 7 additions, 10 deletionsnet/ipv4/ip_output.c
- net/ipv4/netfilter.c 22 additions, 38 deletionsnet/ipv4/netfilter.c
- net/ipv4/netfilter/ipt_REJECT.c 4 additions, 10 deletionsnet/ipv4/netfilter/ipt_REJECT.c
Loading
Please register or sign in to comment