Kalle Valo 3cd32dde17 Merge branch 'ath-current' into ath-next ... Commit 3c97f5de1f ("ath10k: implement NAPI support") conflicts with ath-current. To avoid any merge problems merge ath-current to ath-next already now. Conflicts: drivers/net/wireless/ath/ath10k/htt_rx.c		2016-09-09 15:19:40 +03:00
..
libertas	libertas: fix non static symbol warning	2016-07-18 22:39:11 +03:00
libertas_tf	net: wireless: marvell: libertas_tf: if_usb: don't print error when allocating urb fails	2016-08-13 14:53:41 -07:00
mwifiex	Merge branch 'ath-current' into ath-next	2016-09-09 15:19:40 +03:00
Kconfig
Makefile
mwl8k.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00