diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-05 16:37:15 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-05 16:37:15 +0200 |
commit | caa552358eb3de5d1cb0f473e92c91d8a875b7f3 (patch) | |
tree | d7c4fe4275c615c118031577ce7b946c8ee2ec06 /drivers/block/zram/zram_drv.h | |
parent | Merge git://git.kvack.org/~bcrl/aio-fixes (diff) | |
parent | Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-... (diff) | |
download | linux-caa552358eb3de5d1cb0f473e92c91d8a875b7f3.tar.xz linux-caa552358eb3de5d1cb0f473e92c91d8a875b7f3.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
- i915 fixes: a few display regressions
- vmwgfx: possible loop forever fix
- nouveau: one userspace interface fix
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau/core: don't leak oclass type bits to user
drm/i915: Fix lock dropping in intel_tv_detect()
drm/i915: handle G45/GM45 pulse detection connected state.
drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
drm/vmwgfx: Fix an incorrect OOM return value
drm/i915: Remove bogus __init annotation from DMI callbacks
drm/i915: don't warn if backlight unexpectedly enabled
drm/i915: Move intel_ddi_set_vc_payload_alloc(false) to haswell_crtc_disable()
drm/i915: fix plane/cursor handling when runtime suspended
drm/i915: Ignore VBT backlight presence check on Acer C720 (4005U)
Diffstat (limited to 'drivers/block/zram/zram_drv.h')
0 files changed, 0 insertions, 0 deletions