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	doc: Add "*.svg" to DocBook/.gitignore	2013-12-02 14:49:19 +01:00
80211.tmpl	cfg80211: docs: remove station_info_flags	2015-01-14 13:57:36 +01:00
alsa-driver-api.tmpl	ALSA: doc: Fix missing "I" for kerneldoc inclusion	2014-10-30 15:42:33 +01:00
crypto-API.tmpl	crypto: doc - crypto API high level spec	2014-11-13 22:31:36 +08:00
debugobjects.tmpl
device-drivers.tmpl	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-08-05 17:46:42 -07:00
deviceiobook.tmpl
drm.tmpl	drm/doc: Document drm_add_modes_noedid() usage	2014-12-11 10:28:41 +10:00
filesystems.tmpl	htmldocs: fix bio.c location	2014-05-20 08:17:35 -06:00
gadget.tmpl	usb: patches for v3.17 merge window	2014-07-21 11:33:41 -07:00
genericirq.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
kernel-api.tmpl	DocBook: include !Emm/util.c in kernel-api to include, kzfree and more	2013-12-02 14:42:57 +01:00
kernel-hacking.tmpl	Merge branch 'akpm' (incoming from Andrew)	2014-04-07 16:38:06 -07:00
kernel-locking.tmpl	locking/Documentation: Move locking related docs into Documentation/locking/	2014-08-13 10:32:03 +02:00
kgdb.tmpl	Documentation: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:03 -08:00
libata.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
librs.tmpl
lsm.tmpl
Makefile	crypto: doc - compile crypto API spec	2014-11-13 22:31:37 +08:00
media_api.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
mtdnand.tmpl	DocBook: fix mtdnand typos	2014-07-12 11:30:36 -07:00
networking.tmpl	docbook: networking: fix file paths for uapi headers	2012-10-15 08:04:41 -07:00
rapidio.tmpl
regulator.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
s390-drivers.tmpl
scsi.tmpl
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl	uio: support memory sizes larger than 32 bits	2014-11-07 10:09:07 -08:00
usb.tmpl	usb: hub: rename khubd to hub_wq in documentation and comments	2014-09-23 22:33:19 -07:00
w1.tmpl	w1: format for DocBook and fixes	2014-02-07 15:40:18 -08:00
writing_musb_glue_layer.tmpl	documentation: docbook: document process of writing an musb glue layer	2014-05-12 12:34:47 -05:00
writing_usb_driver.tmpl	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
writing-an-alsa-driver.tmpl	ALSA: doc: Recommend the use of snd_ctl_elem_info()	2014-10-20 18:06:04 +02:00
z8530book.tmpl