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
..
media	[media] DocBook media: update version number and document changes	2014-12-16 23:21:38 -02:00
.gitignore	…
80211.tmpl	cfg80211: docs: remove station_info_flags	2015-01-14 13:57:36 +01:00
Makefile	…
alsa-driver-api.tmpl	…
crypto-API.tmpl	…
debugobjects.tmpl	…
device-drivers.tmpl	…
deviceiobook.tmpl	…
drm.tmpl	drm/doc: Document drm_add_modes_noedid() usage	2014-12-11 10:28:41 +10:00
filesystems.tmpl	…
gadget.tmpl	…
genericirq.tmpl	…
kernel-api.tmpl	…
kernel-hacking.tmpl	…
kernel-locking.tmpl	…
kgdb.tmpl	…
libata.tmpl	…
librs.tmpl	…
lsm.tmpl	…
media_api.tmpl	…
mtdnand.tmpl	…
networking.tmpl	…
rapidio.tmpl	…
regulator.tmpl	…
s390-drivers.tmpl	…
scsi.tmpl	…
sh.tmpl	…
stylesheet.xsl	…
tracepoint.tmpl	…
uio-howto.tmpl	…
usb.tmpl	…
w1.tmpl	…
writing-an-alsa-driver.tmpl	…
writing_musb_glue_layer.tmpl	…
writing_usb_driver.tmpl	…
z8530book.tmpl	…