Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/orinoco/main.c
No related branches found
No related tags found
Showing
- Documentation/RCU/rculist_nulls.txt 6 additions, 1 deletionDocumentation/RCU/rculist_nulls.txt
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/net/8139too.c 1 addition, 0 deletionsdrivers/net/8139too.c
- drivers/net/arm/ixp4xx_eth.c 3 additions, 1 deletiondrivers/net/arm/ixp4xx_eth.c
- drivers/net/atl1c/atl1c.h 4 additions, 4 deletionsdrivers/net/atl1c/atl1c.h
- drivers/net/atl1c/atl1c_main.c 1 addition, 1 deletiondrivers/net/atl1c/atl1c_main.c
- drivers/net/atlx/atl2.c 1 addition, 1 deletiondrivers/net/atlx/atl2.c
- drivers/net/bonding/bond_main.c 10 additions, 2 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/cs89x0.c 4 additions, 3 deletionsdrivers/net/cs89x0.c
- drivers/net/e100.c 3 additions, 0 deletionsdrivers/net/e100.c
- drivers/net/ehea/ehea_main.c 2 additions, 0 deletionsdrivers/net/ehea/ehea_main.c
- drivers/net/fec.c 1 addition, 0 deletionsdrivers/net/fec.c
- drivers/net/gianfar.c 2 additions, 0 deletionsdrivers/net/gianfar.c
- drivers/net/igb/igb_main.c 37 additions, 40 deletionsdrivers/net/igb/igb_main.c
- drivers/net/isa-skeleton.c 3 additions, 2 deletionsdrivers/net/isa-skeleton.c
- drivers/net/ixgbe/ixgbe_dcb_nl.c 2 additions, 4 deletionsdrivers/net/ixgbe/ixgbe_dcb_nl.c
- drivers/net/phy/phy_device.c 3 additions, 1 deletiondrivers/net/phy/phy_device.c
- drivers/net/plip.c 3 additions, 0 deletionsdrivers/net/plip.c
- drivers/net/ps3_gelic_net.c 1 addition, 0 deletionsdrivers/net/ps3_gelic_net.c
- drivers/net/ps3_gelic_wireless.c 1 addition, 0 deletionsdrivers/net/ps3_gelic_wireless.c
Loading
Please register or sign in to comment