mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
fffddfd6c8
Pull drm merge from Dave Airlie:
"Highlights:
- TI LCD controller KMS driver
- TI OMAP KMS driver merged from staging
- drop gma500 stub driver
- the fbcon locking fixes
- the vgacon dirty like zebra fix.
- open firmware videomode and hdmi common code helpers
- major locking rework for kms object handling - pageflip/cursor
won't block on polling anymore!
- fbcon helper and prime helper cleanups
- i915: all over the map, haswell power well enhancements, valleyview
macro horrors cleaned up, killing lots of legacy GTT code,
- radeon: CS ioctl unification, deprecated UMS support, gpu reset
rework, VM fixes
- nouveau: reworked thermal code, external dp/tmds encoder support
(anx9805), fences sleep instead of polling,
- exynos: all over the driver fixes."
Lovely conflict in radeon/evergreen_cs.c between commit
|
||
---|---|---|
.. | ||
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_usb_driver.tmpl | ||
writing-an-alsa-driver.tmpl | ||
z8530book.tmpl |