system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-27 13:48:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/drivers/net/wireless/ath/ath9k
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
ahb.c ath9k: add platform_device_id for AR9550 2012-07-09 16:36:24 -04:00
ani.c ath9k_hw: Add AR9565 HW support 2012-09-11 15:31:37 -04:00
ani.h ath9k: fix ANI operation in AP mode 2012-06-28 14:37:46 -04:00
antenna.c ath9k: Move LNA code to antenna.c 2012-06-06 15:20:31 -04:00
ar955x_1p0_initvals.h ath9k: add initvals for AR9550 2012-07-09 16:36:26 -04:00
ar5008_initvals.h
ar5008_phy.c ath9k_hw: rename mrcCCKOff to fix smatch warning 2012-06-22 14:44:05 -04:00
ar9001_initvals.h
ar9002_calib.c
ar9002_hw.c ath9k_hw: remove redundant arguments to INIT_INI_ARRAY 2012-07-17 15:11:34 -04:00
ar9002_initvals.h ath9k_hw: INI changes for WoW for AR9002 chipsets 2012-07-12 15:27:16 -04:00
ar9002_mac.c ath9k: Gather and report IRQ sync_cause errors. 2012-04-16 14:16:58 -04:00
ar9002_phy.c ath9k: remove dead code 2012-04-12 15:10:32 -04:00
ar9002_phy.h
ar9003_2p2_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9003_calib.c ath9k_hw: do not load noise floor readings when it is running 2012-07-09 16:36:18 -04:00
ar9003_eeprom.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
ar9003_eeprom.h ath9k_hw: add 8 points for 5G temp slop 2012-09-11 15:31:47 -04:00
ar9003_hw.c ath9k_hw: Add AR9565 initvals 2012-09-11 15:31:36 -04:00
ar9003_mac.c ath9k_hw: Add AR9565 HW support 2012-09-11 15:31:37 -04:00
ar9003_mac.h
ar9003_mci.c ath9k_hw: Wait BT calibration to complete 2012-09-11 15:31:45 -04:00
ar9003_mci.h ath9k_hw: small optimization 2012-09-07 15:03:39 -04:00
ar9003_paprd.c ath9k_hw: calibrate PA input for PA predistortion 2012-09-05 14:53:31 -04:00
ar9003_phy.c ath9k_hw: Rename antenna diversity macros 2012-09-11 15:32:00 -04:00
ar9003_phy.h ath9k_hw: Rename antenna diversity macros 2012-09-11 15:32:00 -04:00
ar9003_rtt.c ath9k_hw: Fix RTT calibration 2012-05-15 17:27:55 -04:00
ar9003_rtt.h ath9k_hw: Fix RTT calibration 2012-05-15 17:27:55 -04:00
ar9330_1p1_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9330_1p2_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9340_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9462_2p0_initvals.h ath9k_hw: use peak detection for 5GHz 2012-09-11 15:31:46 -04:00
ar9485_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9565_1p0_initvals.h ath9k_hw: Add AR9565 initvals 2012-09-11 15:31:36 -04:00
ar9580_1p0_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ath9k.h ath9k: Remove an obselete function declaration 2012-09-11 15:13:52 -04:00
beacon.c ath9k: Fix race in reset-work usage 2012-07-17 15:11:40 -04:00
btcoex.c ath9k: improve BT FTP/PAN performance 2012-06-06 15:20:30 -04:00
btcoex.h ath9k: improve BT FTP/PAN performance 2012-06-06 15:20:30 -04:00
calib.c
calib.h ath9k_hw: remove redundant arguments to INIT_INI_ARRAY 2012-07-17 15:11:34 -04:00
common.c
common.h
debug.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
debug.h ath9k_hw: Wait BT calibration to complete 2012-09-11 15:31:45 -04:00
dfs.c ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs.h ath9k: update to DFS pattern detector interface 2012-04-11 16:23:54 -04:00
dfs_debug.c ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs_debug.h ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs_pattern_detector.c ath9k: add DFS pattern detector 2012-04-11 16:23:52 -04:00
dfs_pattern_detector.h ath9k: add DFS pattern detector 2012-04-11 16:23:52 -04:00
dfs_pri_detector.c ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs_pri_detector.h ath9k: add DFS pattern detector 2012-04-11 16:23:52 -04:00
eeprom.c ath9k: move ath9k_hw_fbin2freq function to eeprom.h 2012-04-17 14:57:13 -04:00
eeprom.h ath9k_hw: add 8 points for 5G temp slop 2012-09-11 15:31:47 -04:00
eeprom_4k.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-12 14:25:04 -04:00
eeprom_9287.c ath9k: Fix modal EEPROM dump 2012-06-05 15:23:20 -04:00
eeprom_def.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-12 14:25:04 -04:00
gpio.c ath9k: Choose correct LED pin for AR9565 2012-09-11 15:32:01 -04:00
hif_usb.c wireless: ath9k-htc: only load firmware in need 2012-09-07 15:03:36 -04:00
hif_usb.h wireless: ath9k-htc: only load firmware in need 2012-09-07 15:03:36 -04:00
htc.h mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
htc_drv_beacon.c mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
htc_drv_debug.c
htc_drv_gpio.c ath9k_htc: Cancel BTCOEX related work before disabling BTCOEX 2012-09-11 15:13:53 -04:00
htc_drv_init.c ath9k_htc: Add a modparam to enable BTCOEX rather than default 2012-09-11 15:13:52 -04:00
htc_drv_main.c ath9k_htc: minor cleanup in ath9k_htc_add_station 2012-09-11 15:13:52 -04:00
htc_drv_txrx.c mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
htc_hst.c ath: Add and use pr_fmt, convert printks to pr_<level> 2012-04-10 14:52:13 -04:00
htc_hst.h
hw-ops.h
hw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
hw.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
init.c ath9k: Set correct max streams for AR9565 2012-09-11 15:31:39 -04:00
Kconfig ath9k: make CONFIG_ATH9K_DFS_CERTIFIED depend on CFG80211_CERTIFICATION_ONUS 2012-07-17 15:11:31 -04:00
link.c ath9k: make PA linearization optional, disabled by default and fix checks 2012-09-10 14:42:43 -04:00
mac.c ath9k: fix interrupt storms on queued hardware reset 2012-08-10 14:50:24 -04:00
mac.h ath9k: fix interrupt storms on queued hardware reset 2012-08-10 14:50:24 -04:00
main.c ath9k: Cleanup add/change_interface callbacks 2012-09-11 15:13:52 -04:00
Makefile ath9k_hw: Add hardware code for WoW 2012-07-12 15:27:16 -04:00
mci.c ath9k_hw: Wait BT calibration to complete 2012-09-11 15:31:45 -04:00
mci.h ath9k: Setup MCI interrupts properly 2012-06-06 15:20:24 -04:00
pci.c ath9k: Add PCI ID for AR9565 2012-09-11 15:31:42 -04:00
phy.h
rc.c ath9k: tune rc_stats to display only valid rates 2012-08-10 15:27:20 -04:00
rc.h ath9k: Trim rate table 2012-08-10 15:27:19 -04:00
recv.c ath9k: fix decrypt_error initialization in ath_rx_tasklet() 2012-08-13 15:17:24 -04:00
reg.h ath9k_hw: Add version/revision macros for AR9565 2012-09-11 15:31:34 -04:00
wmi.c
wmi.h
wow.c ath9k_hw: Add hardware code for WoW 2012-07-12 15:27:16 -04:00
xmit.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-09-07 15:07:55 -04:00