summary refs log tree commit diff
path: root/drivers/sbus
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-30 16:17:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-30 16:17:10 -0700
commit418a95bc0e26c27b693eb6276f92012f45ed568f (patch)
tree923fde6851c3c84c62727a5df2cc8b256856b657 /drivers/sbus
parent155e3a353943a3e713cd33357cfd58e995900a81 (diff)
parent6e4dcff3adbf25acb87e74500a58e3c07bdec40f (diff)
downloadlinux-418a95bc0e26c27b693eb6276f92012f45ed568f.tar.gz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "Since we are getting to the pointy end, one i915 black screen on some
  machines, and one vmwgfx stop userspace ability to nuke the VM,

  There might be one or two ati or nouveau fixes trickle in before
  final, but I think this should pretty much be it"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Split GMR2_REMAP commands if they are to large
  drm/i915: ivb: fix edp voltage swing reg val
Diffstat (limited to 'drivers/sbus')
0 files changed, 0 insertions, 0 deletions