Daniel Vetter 54499b2a92 Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued ... So with all the code movement and extraction in intel_pm.c in -next git is hopelessly confused with commit 2208d655a9 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Nov 14 09:25:29 2014 +0100 drm/i915: drop WaSetupGtModeTdRowDispatch:snb from -fixes. Worse even small changes in -next move around the conflict context so rerere is equally useless. Let's just backmerge and be done with it. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Except for git getting lost no tricky conflicts really. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2014-11-19 18:17:38 +01:00
..
media	Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6	2014-10-31 11:55:40 -07: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
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	drm/i915: Add PSR docbook	2014-11-17 19:13:24 +01: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	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
scsi.tmpl
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07: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: Update document about PCM nonatomic ops	2014-09-15 15:52:41 +02:00
z8530book.tmpl