John W. Linville 09f921f83f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ...

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

2010-12-02 15:46:37 -05:00

..

ahb.c

…

ani.c

…

ani.h

…

ar5008_initvals.h

…

ar5008_phy.c

…

ar9001_initvals.h

…

ar9002_calib.c

…

ar9002_hw.c

…

ar9002_initvals.h

…

ar9002_mac.c

…

ar9002_phy.c

…

ar9002_phy.h

…

ar9003_2p2_initvals.h

…

ar9003_calib.c

…

ar9003_eeprom.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

ar9003_eeprom.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

ar9003_hw.c

…

ar9003_mac.c

…

ar9003_mac.h

…

ar9003_paprd.c

…

ar9003_phy.c

ath9k: Add support for Adaptive Power Management

2010-11-30 13:49:13 -05:00

ar9003_phy.h

…

ath9k.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

beacon.c

ath9k: Add support for Adaptive Power Management

2010-11-30 13:49:13 -05:00

btcoex.c

ath9k: Remove code which enables btcoex based on subsys id

2010-11-29 15:24:36 -05:00

btcoex.h

ath9k: Remove code which enables btcoex based on subsys id

2010-11-29 15:24:36 -05:00

calib.c

…

calib.h

…

common.c

…

common.h

…

debug.c

ath9k: Move debugfs under ieee80211/[phyname]/ath9k/

2010-12-02 15:16:41 -05:00

debug.h

ath9k: Move debugfs under ieee80211/[phyname]/ath9k/

2010-12-02 15:16:41 -05:00

eeprom_4k.c

…

eeprom_9287.c

ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB)

2010-11-24 16:19:41 -05:00

eeprom_def.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

eeprom.c

ath9k_hw: fix endian issues with CTLs on AR9003

2010-12-02 14:10:33 -05:00

eeprom.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

gpio.c

…

hif_usb.c

wireless: Remove unnecessary casts of usb_get_intfdata

2010-12-02 15:16:47 -05:00

hif_usb.h

…

htc_drv_beacon.c

…

htc_drv_gpio.c

…

htc_drv_init.c

ath9k_htc: Identify devices using driver_info

2010-11-24 16:19:41 -05:00

htc_drv_main.c

Revert "ath9k_htc: Handle monitor mode properly for HTC devices"

2010-11-29 15:24:36 -05:00

htc_drv_txrx.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-11-24 16:19:24 -05:00

htc_hst.c

ath9k_htc: Identify devices using driver_info

2010-11-24 16:19:41 -05:00

htc_hst.h

ath9k_htc: Remove unused structures

2010-12-02 15:16:48 -05:00

htc.h

ath9k_htc: Identify devices using driver_info

2010-11-24 16:19:41 -05:00

hw-ops.h

…

hw.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

hw.h

ath9k: Add support for Adaptive Power Management

2010-11-30 13:49:13 -05:00

init.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

Kconfig

…

mac.c

Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames"

2010-12-02 14:10:58 -05:00

mac.h

ath9k_hw: remove ath9k_hw_stoppcurecv

2010-11-24 16:19:41 -05:00

main.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

Makefile

…

pci.c

…

phy.h

…

rc.c

ath9k: avoid aggregation for VO traffic

2010-11-24 16:19:35 -05:00

rc.h

…

recv.c

Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames"

2010-12-02 14:10:58 -05:00

reg.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-12-02 15:46:37 -05:00

virtual.c

…

wmi.c

…

wmi.h

…

xmit.c

ath9k: Add support for Adaptive Power Management

2010-11-30 13:49:13 -05:00