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: Bluetooth: Fix crash with incoming L2CAP connections Bluetooth: Fix regression in L2CAP connection procedure gianfar: rx parser r6040: only disable RX interrupt if napi_schedule_prep is successful net: remove NETIF_F_ALL_TX_OFFLOADS net: sctp: fix checksum marking for outgoing packets
Showing
- drivers/net/bonding/bond_main.c 3 additions, 3 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/gianfar.c 19 additions, 5 deletionsdrivers/net/gianfar.c
- drivers/net/gianfar.h 2 additions, 1 deletiondrivers/net/gianfar.h
- drivers/net/r6040.c 5 additions, 3 deletionsdrivers/net/r6040.c
- include/linux/netdevice.h 0 additions, 6 deletionsinclude/linux/netdevice.h
- net/8021q/vlan_dev.c 5 additions, 1 deletionnet/8021q/vlan_dev.c
- net/bluetooth/l2cap_core.c 5 additions, 4 deletionsnet/bluetooth/l2cap_core.c
- net/sctp/output.c 8 additions, 11 deletionsnet/sctp/output.c
Loading
Please register or sign in to comment