93bb70e0c0
There was some merge conflicts in -next and they weren't so pretty, so backmerge now to avoid them. Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_modes.c |
||
---|---|---|
.. | ||
media | ||
.gitignore | ||
80211.tmpl | ||
alsa-driver-api.tmpl | ||
debugobjects.tmpl | ||
device-drivers.tmpl | ||
deviceiobook.tmpl | ||
drm.tmpl | ||
filesystems.tmpl | ||
gadget.tmpl | ||
genericirq.tmpl | ||
kernel-api.tmpl | ||
kernel-hacking.tmpl | ||
kernel-locking.tmpl | ||
kgdb.tmpl | ||
libata.tmpl | ||
librs.tmpl | ||
lsm.tmpl | ||
Makefile | ||
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 | ||
writing-an-alsa-driver.tmpl | ||
writing_usb_driver.tmpl | ||
z8530book.tmpl |