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
..
brcmfmac	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
brcmsmac	brcmsmac: don't leak kernel memory via printk()	2014-12-15 13:46:20 -05:00
brcmutil	brcmutil: add helper function to format board revision	2014-12-01 15:57:20 -05:00
include	brcmfmac: get rid of duplicate SDIO device identifiers	2015-01-09 15:48:06 +02:00
Kconfig	brcmfmac: conditionally compile firmware protocol source code	2014-09-15 15:09:26 -04:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00