Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ehea/ehea_main.c drivers/net/wireless/iwlwifi/Kconfig drivers/net/wireless/rt2x00/rt61pci.c net/ipv4/inet_timewait_sock.c net/ipv6/raw.c net/mac80211/ieee80211_sta.c
Showing
- drivers/isdn/i4l/isdn_net.c 1 addition, 0 deletionsdrivers/isdn/i4l/isdn_net.c
- drivers/net/bnx2x.c 3 additions, 3 deletionsdrivers/net/bnx2x.c
- drivers/net/ehea/ehea.h 2 additions, 1 deletiondrivers/net/ehea/ehea.h
- drivers/net/ehea/ehea_main.c 22 additions, 2 deletionsdrivers/net/ehea/ehea_main.c
- drivers/net/forcedeth.c 26 additions, 5 deletionsdrivers/net/forcedeth.c
- drivers/net/fs_enet/fs_enet-main.c 2 additions, 1 deletiondrivers/net/fs_enet/fs_enet-main.c
- drivers/net/macb.c 8 additions, 6 deletionsdrivers/net/macb.c
- drivers/net/phy/marvell.c 0 additions, 2 deletionsdrivers/net/phy/marvell.c
- drivers/net/sc92031.c 1 addition, 0 deletionsdrivers/net/sc92031.c
- drivers/net/sky2.c 1 addition, 0 deletionsdrivers/net/sky2.c
- drivers/net/smc91x.c 2 additions, 0 deletionsdrivers/net/smc91x.c
- drivers/net/starfire.c 5 additions, 6 deletionsdrivers/net/starfire.c
- drivers/net/tg3.c 145 additions, 12 deletionsdrivers/net/tg3.c
- drivers/net/tg3.h 76 additions, 3 deletionsdrivers/net/tg3.h
- drivers/net/tokenring/olympic.c 13 additions, 8 deletionsdrivers/net/tokenring/olympic.c
- drivers/net/tun.c 37 additions, 1 deletiondrivers/net/tun.c
- drivers/net/ucc_geth.c 30 additions, 23 deletionsdrivers/net/ucc_geth.c
- drivers/net/virtio_net.c 3 additions, 2 deletionsdrivers/net/virtio_net.c
- drivers/net/wan/Kconfig 5 additions, 1 deletiondrivers/net/wan/Kconfig
- drivers/net/wireless/hostap/hostap_80211_rx.c 24 additions, 15 deletionsdrivers/net/wireless/hostap/hostap_80211_rx.c
Loading
Please register or sign in to comment