Kalle Valo 6b03e32d57 Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next ... Patch "ath9k: Fix no-ack frame status" needs these mac80211 patches: commit 5cf16616e1 Author: Sujith Manoharan <c_manoha@qca.qualcomm.com> Date: Wed Dec 10 21:26:11 2014 +0530 mac80211: Fix accounting of multicast frames commit 6b127c71fb Author: Sujith Manoharan <c_manoha@qca.qualcomm.com> Date: Wed Dec 10 21:26:10 2014 +0530 mac80211: Move IEEE80211_TX_CTL_PS_RESPONSE Conflicts: drivers/net/wireless/ath/wil6210/cfg80211.c drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c		2015-01-22 14:49:44 +02:00
..
core	staging: rtl8723au: Remove unused rtw_sctx_done23a() function	2014-12-02 16:40:00 -08:00
hal	staging: rtl8723au: hal: Removed the extra semicolon	2014-12-02 16:54:43 -08:00
include	staging: rtl8723au: Remove unused slimcombo debug flag	2014-12-02 16:40:01 -08:00
os_dep	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
Kconfig	staging: rtl8723au: Remove P2P/WiFiDirect/WiFiDisplay code	2014-04-15 11:03:56 -07:00
Makefile	staging: rtl8723au: Fold rtw_ack_tx_done23a() into rtw23a_sctx_done_err()	2014-12-02 16:40:00 -08:00
TODO	staging: r8723au: Turn on build of new driver	2014-04-05 14:53:46 -07:00