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/rtlwifi/pci.c include/linux/netlink.h
Showing
- drivers/bcma/bcma_private.h 2 additions, 2 deletionsdrivers/bcma/bcma_private.h
- drivers/bcma/core.c 2 additions, 1 deletiondrivers/bcma/core.c
- drivers/bcma/driver_chipcommon_pmu.c 5 additions, 1 deletiondrivers/bcma/driver_chipcommon_pmu.c
- drivers/bcma/driver_pci.c 1 addition, 0 deletionsdrivers/bcma/driver_pci.c
- drivers/bcma/host_pci.c 1 addition, 0 deletionsdrivers/bcma/host_pci.c
- drivers/bcma/main.c 0 additions, 2 deletionsdrivers/bcma/main.c
- drivers/net/b44.c 2 additions, 2 deletionsdrivers/net/b44.c
- drivers/net/wireless/ath/ath5k/ahb.c 1 addition, 0 deletionsdrivers/net/wireless/ath/ath5k/ahb.c
- drivers/net/wireless/ath/ath5k/ath5k.h 4 additions, 3 deletionsdrivers/net/wireless/ath/ath5k/ath5k.h
- drivers/net/wireless/ath/ath5k/base.c 7 additions, 8 deletionsdrivers/net/wireless/ath/ath5k/base.c
- drivers/net/wireless/ath/ath5k/mac80211-ops.c 2 additions, 4 deletionsdrivers/net/wireless/ath/ath5k/mac80211-ops.c
- drivers/net/wireless/ath/ath5k/reset.c 3 additions, 3 deletionsdrivers/net/wireless/ath/ath5k/reset.c
- drivers/net/wireless/ath/ath9k/ahb.c 4 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/ahb.c
- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 28 additions, 11 deletionsdrivers/net/wireless/ath/ath9k/ar9003_eeprom.c
- drivers/net/wireless/ath/ath9k/ar9003_hw.c 175 additions, 7 deletionsdrivers/net/wireless/ath/ath9k/ar9003_hw.c
- drivers/net/wireless/ath/ath9k/ar9003_paprd.c 37 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/ar9003_paprd.c
- drivers/net/wireless/ath/ath9k/ar9003_phy.c 34 additions, 7 deletionsdrivers/net/wireless/ath/ath9k/ar9003_phy.c
- drivers/net/wireless/ath/ath9k/ar9003_phy.h 4 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/ar9003_phy.h
- drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h 1147 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
- drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h 1080 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
Loading
Please register or sign in to comment