Daniel Vetter 336879b1da Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework ... Dave asked me to do the backmerge before sending him the revised pull request, so here we go. Nothing fancy in the conflicts, just a few things changed right next to each another. Conflicts: drivers/gpu/drm/drm_irq.c Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2014-09-11 14:46:53 +02:00
..
media	[media] DocBook/media: document the new RDS RX controls	2014-07-25 19:28:45 -03:00
.gitignore	doc: Add "*.svg" to DocBook/.gitignore	2013-12-02 14:49:19 +01:00
80211.tmpl	cfg80211: refactor cfg80211_can_use_iftype_chan()	2014-04-09 10:55:39 +02:00
alsa-driver-api.tmpl	ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks	2009-03-09 15:22:59 +01:00
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
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	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework	2014-09-11 14:46:53 +02: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	DocBook: fix various typos	2014-07-12 11:30:36 -07: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	docbook: librs typo fixes	2007-05-08 11:15:15 -07:00
lsm.tmpl	Add missing section ID to lsm.tmpl	2008-02-07 08:42:16 -08:00
Makefile	documentation: docbook: document process of writing an musb glue layer	2014-05-12 12:34:47 -05: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	docbook: fix rapidio warning	2011-03-27 19:30:19 -07:00
regulator.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
s390-drivers.tmpl	docbook: fix s390 fatal error after header files moved	2008-08-05 16:56:29 -07:00
scsi.tmpl	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
stylesheet.xsl	docbook: use IDs as filenames to support multiple books	2010-08-05 13:21:24 -07:00
tracepoint.tmpl	workqueue: Add a workqueue chapter to the tracepoint docbook	2010-08-27 12:27:36 +02:00
uio-howto.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
usb.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -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	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
z8530book.tmpl	Rationalise Randy's address a bit	2008-10-30 11:38:47 -07:00