Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c
No related branches found
No related tags found
Showing
- MAINTAINERS 0 additions, 1 deletionMAINTAINERS
- drivers/atm/adummy.c 1 addition, 1 deletiondrivers/atm/adummy.c
- drivers/atm/ambassador.c 2 additions, 1 deletiondrivers/atm/ambassador.c
- drivers/atm/atmtcp.c 1 addition, 1 deletiondrivers/atm/atmtcp.c
- drivers/atm/eni.c 1 addition, 1 deletiondrivers/atm/eni.c
- drivers/atm/firestream.c 1 addition, 1 deletiondrivers/atm/firestream.c
- drivers/atm/fore200e.c 7 additions, 7 deletionsdrivers/atm/fore200e.c
- drivers/atm/he.c 1 addition, 1 deletiondrivers/atm/he.c
- drivers/atm/horizon.c 2 additions, 1 deletiondrivers/atm/horizon.c
- drivers/atm/idt77252.c 2 additions, 1 deletiondrivers/atm/idt77252.c
- drivers/atm/iphase.c 1 addition, 1 deletiondrivers/atm/iphase.c
- drivers/atm/lanai.c 1 addition, 1 deletiondrivers/atm/lanai.c
- drivers/atm/nicstar.c 2 additions, 1 deletiondrivers/atm/nicstar.c
- drivers/atm/solos-pci.c 4 additions, 4 deletionsdrivers/atm/solos-pci.c
- drivers/atm/zatm.c 1 addition, 1 deletiondrivers/atm/zatm.c
- drivers/bluetooth/hci_ldisc.c 4 additions, 2 deletionsdrivers/bluetooth/hci_ldisc.c
- drivers/connector/connector.c 1 addition, 0 deletionsdrivers/connector/connector.c
- drivers/net/benet/be.h 1 addition, 1 deletiondrivers/net/benet/be.h
- drivers/net/benet/be_cmds.c 45 additions, 30 deletionsdrivers/net/benet/be_cmds.c
- drivers/net/benet/be_main.c 1 addition, 1 deletiondrivers/net/benet/be_main.c
Loading
Please register or sign in to comment