Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/iucv/af_iucv.c
No related branches found
No related tags found
Showing
- drivers/net/8139too.c 5 additions, 5 deletionsdrivers/net/8139too.c
- drivers/net/mlx4/en_main.c 2 additions, 3 deletionsdrivers/net/mlx4/en_main.c
- drivers/net/mlx4/en_netdev.c 12 additions, 9 deletionsdrivers/net/mlx4/en_netdev.c
- drivers/net/mlx4/en_port.c 13 additions, 32 deletionsdrivers/net/mlx4/en_port.c
- drivers/net/mlx4/en_resources.c 6 additions, 0 deletionsdrivers/net/mlx4/en_resources.c
- drivers/net/mlx4/en_rx.c 4 additions, 8 deletionsdrivers/net/mlx4/en_rx.c
- drivers/net/mlx4/en_tx.c 1 addition, 0 deletionsdrivers/net/mlx4/en_tx.c
- drivers/net/mlx4/mlx4_en.h 1 addition, 0 deletionsdrivers/net/mlx4/mlx4_en.h
- drivers/net/pcmcia/pcnet_cs.c 1 addition, 1 deletiondrivers/net/pcmcia/pcnet_cs.c
- drivers/net/ucc_geth.c 2 additions, 1 deletiondrivers/net/ucc_geth.c
- drivers/net/wireless/atmel.c 0 additions, 1 deletiondrivers/net/wireless/atmel.c
- drivers/net/wireless/iwlwifi/iwl-3945.c 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/iwl-3945.c
- drivers/net/wireless/iwlwifi/iwl-3945.h 1 addition, 0 deletionsdrivers/net/wireless/iwlwifi/iwl-3945.h
- drivers/net/wireless/iwlwifi/iwl-agn.c 3 additions, 8 deletionsdrivers/net/wireless/iwlwifi/iwl-agn.c
- drivers/net/wireless/iwlwifi/iwl-csr.h 1 addition, 1 deletiondrivers/net/wireless/iwlwifi/iwl-csr.h
- drivers/net/wireless/iwlwifi/iwl-dev.h 4 additions, 0 deletionsdrivers/net/wireless/iwlwifi/iwl-dev.h
- drivers/net/wireless/iwlwifi/iwl-tx.c 56 additions, 43 deletionsdrivers/net/wireless/iwlwifi/iwl-tx.c
- drivers/net/wireless/iwlwifi/iwl3945-base.c 104 additions, 44 deletionsdrivers/net/wireless/iwlwifi/iwl3945-base.c
- drivers/net/wireless/mwl8k.c 1 addition, 2 deletionsdrivers/net/wireless/mwl8k.c
- firmware/Makefile 1 addition, 0 deletionsfirmware/Makefile
Loading
Please register or sign in to comment