John W. Linville 655d8e2328 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next ... Conflicts: drivers/net/wireless/ath/carl9170/debug.c drivers/net/wireless/ath/carl9170/main.c net/mac80211/ieee80211_i.h		2013-04-10 14:09:54 -04:00
..
ahb.c	ath5k: Use module_platform_driver macro for ahb.c	2012-11-16 14:11:15 -05:00
ani.c
ani.h
ath5k.h	ath5k: cleanup channel to eprom_mode function	2013-03-06 16:24:27 -05:00
attach.c
base.c	mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan	2013-03-25 19:19:35 +01:00
base.h
caps.c
debug.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-04-12 13:49:28 -04:00
debug.h
desc.c	ath5k: Remove extraneous statements from ath5k_hw_proc_4word_tx_status and ath5k_hw_proc_2word_status.	2012-04-11 16:23:58 -04:00
desc.h
dma.c
eeprom.c	ath5k: cleanup channel to eprom_mode function	2013-03-06 16:24:27 -05:00
eeprom.h	ath5k: cleanup channel to eprom_mode function	2013-03-06 16:24:27 -05:00
gpio.c
initvals.c
Kconfig	wireless: allow Atheros card to not depend on ath.ko	2012-11-30 13:38:16 -05:00
led.c	ath5k: remove __dev* attributes	2012-12-06 15:04:56 -05:00
mac80211-ops.c	mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan	2013-03-25 19:19:35 +01:00
Makefile
pci.c	ath5k: remove __dev* attributes	2012-12-06 15:04:56 -05:00
pcu.c	mac80211: remove hw.conf.channel usage where possible	2012-04-13 14:32:50 -04:00
phy.c	ath5k: cleanup channel to eprom_mode function	2013-03-06 16:24:27 -05:00
qcu.c	mac80211: remove hw.conf.channel usage where possible	2012-04-13 14:32:50 -04:00
reg.h
reset.c	ath5k: cleanup channel to eprom_mode function	2013-03-06 16:24:27 -05:00
rfbuffer.h
rfgain.h
rfkill.c
sysfs.c
trace.h