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) ucc_geth: Fix oops when using fixed-link support dm9000: locking bugfix net: update dnet.c for bus_id removal dnet: DNET should depend on HAS_IOMEM dca: add missing copyright/license headers nl80211: Check that function pointer != NULL before using it sungem: missing net_device_ops be2net: fix to restore vlan ids into BE2 during a IF DOWN->UP cycle be2net: replenish when posting to rx-queue is starved in out of mem conditions bas_gigaset: correctly allocate USB interrupt transfer buffer smsc911x: reset last known duplex and carrier on open sh_eth: Fix mistake of the address of SH7763 sh_eth: Change handling of IRQ netns: oops in ip[6]_frag_reasm incrementing stats net: kfree(napi->skb) => kfree_skb net: fix sctp breakage ipv6: fix display of local and remote sit endpoints net: Document /proc/sys/net/core/netdev_budget tulip: fix crash on iface up with shirq debug virtio_net: Make virtio_net support carrier detection ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/proc.txt 7 additions, 0 deletionsDocumentation/filesystems/proc.txt
- drivers/dca/dca-sysfs.c 21 additions, 0 deletionsdrivers/dca/dca-sysfs.c
- drivers/isdn/gigaset/bas-gigaset.c 13 additions, 3 deletionsdrivers/isdn/gigaset/bas-gigaset.c
- drivers/net/Kconfig 1 addition, 1 deletiondrivers/net/Kconfig
- drivers/net/benet/be.h 1 addition, 0 deletionsdrivers/net/benet/be.h
- drivers/net/benet/be_main.c 34 additions, 26 deletionsdrivers/net/benet/be_main.c
- drivers/net/bnx2.c 6 additions, 6 deletionsdrivers/net/bnx2.c
- drivers/net/bonding/bond_main.c 20 additions, 5 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/dm9000.c 4 additions, 2 deletionsdrivers/net/dm9000.c
- drivers/net/dnet.c 3 additions, 3 deletionsdrivers/net/dnet.c
- drivers/net/sh_eth.c 17 additions, 3 deletionsdrivers/net/sh_eth.c
- drivers/net/sh_eth.h 2 additions, 2 deletionsdrivers/net/sh_eth.h
- drivers/net/smsc911x.c 4 additions, 0 deletionsdrivers/net/smsc911x.c
- drivers/net/sungem.c 4 additions, 5 deletionsdrivers/net/sungem.c
- drivers/net/tulip/tulip_core.c 29 additions, 16 deletionsdrivers/net/tulip/tulip_core.c
- drivers/net/ucc_geth.c 10 additions, 24 deletionsdrivers/net/ucc_geth.c
- drivers/net/ucc_geth.h 1 addition, 2 deletionsdrivers/net/ucc_geth.h
- drivers/net/virtio_net.c 3 additions, 0 deletionsdrivers/net/virtio_net.c
- drivers/net/wireless/ath9k/ath9k.h 2 additions, 2 deletionsdrivers/net/wireless/ath9k/ath9k.h
- drivers/net/wireless/ath9k/core.h 33 additions, 0 deletionsdrivers/net/wireless/ath9k/core.h
Loading
Please register or sign in to comment