Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl4965-base.c
Showing
- Documentation/networking/s2io.txt 3 additions, 3 deletionsDocumentation/networking/s2io.txt
- drivers/connector/connector.c 40 additions, 0 deletionsdrivers/connector/connector.c
- drivers/net/3c59x.c 3 additions, 2 deletionsdrivers/net/3c59x.c
- drivers/net/e100.c 2 additions, 0 deletionsdrivers/net/e100.c
- drivers/net/e1000/e1000_ethtool.c 1 addition, 1 deletiondrivers/net/e1000/e1000_ethtool.c
- drivers/net/e1000e/netdev.c 2 additions, 1 deletiondrivers/net/e1000e/netdev.c
- drivers/net/hamradio/dmascc.c 0 additions, 2 deletionsdrivers/net/hamradio/dmascc.c
- drivers/net/igb/igb_main.c 2 additions, 1 deletiondrivers/net/igb/igb_main.c
- drivers/net/ipg.c 8 additions, 8 deletionsdrivers/net/ipg.c
- drivers/net/ixgbe/ixgbe_main.c 2 additions, 1 deletiondrivers/net/ixgbe/ixgbe_main.c
- drivers/net/netxen/netxen_nic_main.c 11 additions, 7 deletionsdrivers/net/netxen/netxen_nic_main.c
- drivers/net/pcmcia/axnet_cs.c 2 additions, 0 deletionsdrivers/net/pcmcia/axnet_cs.c
- drivers/net/pcmcia/pcnet_cs.c 3 additions, 0 deletionsdrivers/net/pcmcia/pcnet_cs.c
- drivers/net/pppoe.c 1 addition, 1 deletiondrivers/net/pppoe.c
- drivers/net/qla3xxx.c 2 additions, 0 deletionsdrivers/net/qla3xxx.c
- drivers/net/r6040.c 1 addition, 1 deletiondrivers/net/r6040.c
- drivers/net/s2io.c 12 additions, 23 deletionsdrivers/net/s2io.c
- drivers/net/s2io.h 0 additions, 4 deletionsdrivers/net/s2io.h
- drivers/net/tc35815.c 3 additions, 1 deletiondrivers/net/tc35815.c
- drivers/net/wan/x25_asy.c 3 additions, 0 deletionsdrivers/net/wan/x25_asy.c
Loading
Please register or sign in to comment