Merge branch 'master' of...
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/rt2x00/rt2x00queue.c drivers/net/wireless/rt2x00/rt2x00queue.h
Showing
- drivers/bluetooth/Kconfig 2 additions, 2 deletionsdrivers/bluetooth/Kconfig
- drivers/bluetooth/ath3k.c 0 additions, 3 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/btmrvl_sdio.c 94 additions, 30 deletionsdrivers/bluetooth/btmrvl_sdio.c
- drivers/bluetooth/btmrvl_sdio.h 36 additions, 32 deletionsdrivers/bluetooth/btmrvl_sdio.h
- drivers/bluetooth/hci_ath.c 6 additions, 1 deletiondrivers/bluetooth/hci_ath.c
- drivers/bluetooth/hci_h4.c 6 additions, 1 deletiondrivers/bluetooth/hci_h4.c
- drivers/bluetooth/hci_ldisc.c 4 additions, 2 deletionsdrivers/bluetooth/hci_ldisc.c
- drivers/net/wireless/ath/ath.h 1 addition, 8 deletionsdrivers/net/wireless/ath/ath.h
- drivers/net/wireless/ath/ath5k/ahb.c 28 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/ahb.c
- drivers/net/wireless/ath/ath5k/ath5k.h 24 additions, 7 deletionsdrivers/net/wireless/ath/ath5k/ath5k.h
- drivers/net/wireless/ath/ath5k/attach.c 6 additions, 1 deletiondrivers/net/wireless/ath/ath5k/attach.c
- drivers/net/wireless/ath/ath5k/base.c 56 additions, 15 deletionsdrivers/net/wireless/ath/ath5k/base.c
- drivers/net/wireless/ath/ath5k/base.h 6 additions, 1 deletiondrivers/net/wireless/ath/ath5k/base.h
- drivers/net/wireless/ath/ath5k/caps.c 3 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/caps.c
- drivers/net/wireless/ath/ath5k/debug.c 19 additions, 46 deletionsdrivers/net/wireless/ath/ath5k/debug.c
- drivers/net/wireless/ath/ath5k/debug.h 0 additions, 17 deletionsdrivers/net/wireless/ath/ath5k/debug.h
- drivers/net/wireless/ath/ath5k/desc.c 62 additions, 96 deletionsdrivers/net/wireless/ath/ath5k/desc.c
- drivers/net/wireless/ath/ath5k/eeprom.c 70 additions, 88 deletionsdrivers/net/wireless/ath/ath5k/eeprom.c
- drivers/net/wireless/ath/ath5k/mac80211-ops.c 9 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/mac80211-ops.c
- drivers/net/wireless/ath/ath5k/pci.c 32 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/pci.c
Loading
Please register or sign in to comment