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: (27 commits) netfilter: fix CONFIG_COMPAT support isdn/avm: fix build when PCMCIA is not enabled header: fix broken headers for user space e1000e: don't check for alternate MAC addr on parts that don't support it e1000e: disable ASPM L1 on 82573 ll_temac: Fix poll implementation netxen: fix a race in netxen_nic_get_stats() qlnic: fix a race in qlcnic_get_stats() irda: fix a race in irlan_eth_xmit() net: sh_eth: remove unused variable netxen: update version 4.0.74 netxen: fix inconsistent lock state vlan: Match underlying dev carrier on vlan add ibmveth: Fix opps during MTU change on an active device ehea: Fix synchronization between HW and SW send queue bnx2x: Update bnx2x version to 1.52.53-4 bnx2x: Fix PHY locking problem rds: fix a leak of kernel memory netlink: fix compat recvmsg netfilter: fix userspace header warning ...
No related branches found
No related tags found
Showing
- drivers/isdn/hardware/avm/Kconfig 2 additions, 1 deletiondrivers/isdn/hardware/avm/Kconfig
- drivers/net/Kconfig 10 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/bnx2x/bnx2x.h 2 additions, 2 deletionsdrivers/net/bnx2x/bnx2x.h
- drivers/net/bnx2x/bnx2x_main.c 7 additions, 2 deletionsdrivers/net/bnx2x/bnx2x_main.c
- drivers/net/e1000e/82571.c 18 additions, 13 deletionsdrivers/net/e1000e/82571.c
- drivers/net/e1000e/defines.h 4 additions, 0 deletionsdrivers/net/e1000e/defines.h
- drivers/net/e1000e/lib.c 10 additions, 0 deletionsdrivers/net/e1000e/lib.c
- drivers/net/ehea/ehea.h 2 additions, 1 deletiondrivers/net/ehea/ehea.h
- drivers/net/ehea/ehea_main.c 59 additions, 1 deletiondrivers/net/ehea/ehea_main.c
- drivers/net/ibmveth.c 15 additions, 17 deletionsdrivers/net/ibmveth.c
- drivers/net/ll_temac_main.c 2 additions, 2 deletionsdrivers/net/ll_temac_main.c
- drivers/net/netxen/netxen_nic.h 2 additions, 2 deletionsdrivers/net/netxen/netxen_nic.h
- drivers/net/netxen/netxen_nic_init.c 0 additions, 4 deletionsdrivers/net/netxen/netxen_nic_init.c
- drivers/net/netxen/netxen_nic_main.c 0 additions, 2 deletionsdrivers/net/netxen/netxen_nic_main.c
- drivers/net/pxa168_eth.c 1666 additions, 0 deletionsdrivers/net/pxa168_eth.c
- drivers/net/qlcnic/qlcnic_main.c 0 additions, 2 deletionsdrivers/net/qlcnic/qlcnic_main.c
- drivers/net/sh_eth.c 1 addition, 1 deletiondrivers/net/sh_eth.c
- drivers/net/wireless/adm8211.c 4 additions, 4 deletionsdrivers/net/wireless/adm8211.c
- drivers/net/wireless/at76c50x-usb.c 11 additions, 11 deletionsdrivers/net/wireless/at76c50x-usb.c
Loading
Please register or sign in to comment