David S. Miller 5b9ab2ec04 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/hp-plus.c drivers/net/wireless/ath5k/base.c drivers/net/wireless/ath9k/recv.c net/wireless/reg.c		2008-11-26 23:48:40 -08:00
..
ani.c	ath9k: Refactor hw.c	2008-11-10 15:16:05 -05:00
ath9k.h	ath9k: Fix bug in deciphering channel flags	2008-11-26 09:47:33 -05:00
beacon.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
calib.c	ath9k: incorrect noise floor threshold values.	2008-11-25 16:41:29 -05:00
core.h	ath9k: Use proper TX channel width for setting channels	2008-11-26 09:47:49 -05:00
eeprom.c	ath9k: Configure AR_PHY_SWITCH_COM with apropriate antenna control	2008-11-25 16:41:40 -05:00
hw.c	ath9k: Use proper TX channel width for setting channels	2008-11-26 09:47:49 -05:00
hw.h	ath9k: INI update for atheros chipets.	2008-11-25 16:41:28 -05:00
initvals.h	ath9k: INI update for atheros chipets.	2008-11-25 16:41:28 -05:00
Kconfig
mac.c	ath9k: Update TX trigger level on a FIFO underrun.	2008-11-26 09:47:34 -05:00
main.c	ath9k: Use proper TX channel width for setting channels	2008-11-26 09:47:49 -05:00
Makefile	ath9k: Code scrub	2008-11-26 09:47:49 -05:00
phy.c	ath9k: Refactor hw.c	2008-11-10 15:16:05 -05:00
phy.h
rc.c	ath9k: Code scrub	2008-11-26 09:47:49 -05:00
rc.h	ath9k: Dont update rate control for every AMPDU	2008-11-26 09:47:40 -05:00
recv.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
reg.h
regd_common.h
regd.c
regd.h
xmit.c	ath9k: Use proper TX channel width for setting channels	2008-11-26 09:47:49 -05:00