Daniel Vetter ca6e440577 Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued ... Backmerge fixes since it's getting out of hand again with the massive split due to atomic between -next and 4.2-rc. All the bugfixes in 4.2-rc are addressed already (by converting more towards atomic instead of minimal duct-tape) so just always pick the version in next for the conflicts in modeset code. All the other conflicts are just adjacent lines changed. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.h Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-07-15 16:36:50 +02:00
..
media	[media] DocBook: Change format for enum dmx_output documentation	2015-06-09 17:47:38 -03:00
.gitignore	doc: Add "*.svg" to DocBook/.gitignore	2013-12-02 14:49:19 +01:00
80211.tmpl	wireless: docs: fix 'make pdfdocs' failure	2015-01-28 08:53:58 +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 - Fix typo in crypto-API.tmpl	2015-06-04 15:05:05 +08:00
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	Fix docs build failure caused by i2o removal	2015-02-16 12:52:08 -07:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	drm/i915: fix intel_frontbuffer_flip documentation	2015-07-09 19:17: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	Documentation: extend use case for EXPORT_SYMBOL_GPL()	2015-06-05 07:39:46 +09:00
kernel-locking.tmpl	locking/Documentation: Move locking related docs into Documentation/locking/	2014-08-13 10:32:03 +02:00
kgdb.tmpl	KGDB/KDB New:	2015-02-20 15:13:29 -08:00
libata.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
librs.tmpl
lsm.tmpl
Makefile	DocBook: Do not exceed argument list limit	2015-01-28 11:33:44 -07:00
media_api.tmpl	[media] Docbook: typo fix: use note(d) instead of notice(d)	2015-06-08 14:56:20 -03: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
scsi.tmpl	Doc: Docbook: Change wikipedia's URL from http to https in scsi.tmpl	2015-06-22 10:29:32 -06:00
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl	pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'	2015-02-03 15:48:51 -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