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: (32 commits) net: Added ASSERT_RTNL() to dev_open() and dev_close(). can: Fix can_send() handling on dev_queue_xmit() failures netns: Fix arbitrary net_device-s corruptions on net_ns stop. netfilter: Kconfig: default DCCP/SCTP conntrack support to the protocol config values netfilter: nf_conntrack_sip: restrict RTP expect flushing on error to last request macvlan: Fix memleak on device removal/crash on module removal net/ipv4: correct RFC 1122 section reference in comment tcp FRTO: SACK variant is errorneously used with NewReno e1000e: don't return half-read eeprom on error ucc_geth: Don't use RX clock as TX clock. cxgb3: Use CAP_SYS_RAWIO for firmware pcnet32: delete non NAPI code from driver. fs_enet: Fix a memory leak in fs_enet_mdio_probe [netdrvr] eexpress: IPv6 fails - multicast problems 3c59x: use netstats in net_device structure 3c980-TX needs EXTRA_PREAMBLE fix warning in drivers/net/appletalk/cops.c e1000e: Add support for BM PHYs on ICH9 uli526x: fix endianness issues in the setup frame uli526x: initialize the hardware prior to requesting interrupts ...
Showing
- arch/arm/mach-orion5x/common.c 2 additions, 0 deletionsarch/arm/mach-orion5x/common.c
- arch/powerpc/platforms/chrp/pegasos_eth.c 4 additions, 0 deletionsarch/powerpc/platforms/chrp/pegasos_eth.c
- arch/powerpc/sysdev/mv64x60_dev.c 2 additions, 0 deletionsarch/powerpc/sysdev/mv64x60_dev.c
- arch/ppc/syslib/mv64x60.c 3 additions, 0 deletionsarch/ppc/syslib/mv64x60.c
- drivers/net/3c59x.c 36 additions, 37 deletionsdrivers/net/3c59x.c
- drivers/net/Kconfig 0 additions, 14 deletionsdrivers/net/Kconfig
- drivers/net/appletalk/cops.c 5 additions, 11 deletionsdrivers/net/appletalk/cops.c
- drivers/net/bonding/bond_main.c 14 additions, 10 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bond_sysfs.c 8 additions, 8 deletionsdrivers/net/bonding/bond_sysfs.c
- drivers/net/cxgb3/cxgb3_main.c 2 additions, 2 deletionsdrivers/net/cxgb3/cxgb3_main.c
- drivers/net/e1000e/defines.h 10 additions, 0 deletionsdrivers/net/e1000e/defines.h
- drivers/net/e1000e/e1000.h 6 additions, 1 deletiondrivers/net/e1000e/e1000.h
- drivers/net/e1000e/ethtool.c 33 additions, 12 deletionsdrivers/net/e1000e/ethtool.c
- drivers/net/e1000e/hw.h 22 additions, 0 deletionsdrivers/net/e1000e/hw.h
- drivers/net/e1000e/ich8lan.c 82 additions, 1 deletiondrivers/net/e1000e/ich8lan.c
- drivers/net/e1000e/netdev.c 322 additions, 8 deletionsdrivers/net/e1000e/netdev.c
- drivers/net/e1000e/phy.c 278 additions, 0 deletionsdrivers/net/e1000e/phy.c
- drivers/net/eexpress.c 6 additions, 5 deletionsdrivers/net/eexpress.c
- drivers/net/fs_enet/mii-fec.c 2 additions, 1 deletiondrivers/net/fs_enet/mii-fec.c
- drivers/net/gianfar.c 3 additions, 2 deletionsdrivers/net/gianfar.c
Loading
Please register or sign in to comment