summary refs log tree commit diff
path: root/firmware/e100
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-15 11:44:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-15 11:44:30 -0700
commitc4d0bcc228dd39e1f2286685d6224d436da6622e (patch)
tree15c46166d3ca73dcd264f563b927e4a29826b981 /firmware/e100
parent0336104dcba613586cd22279db445840d4ebcdeb (diff)
parent472313245645661c3bc710f874e660c493d313e1 (diff)
downloadlinux-c4d0bcc228dd39e1f2286685d6224d436da6622e.tar.gz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "Radeon:
     one oops fix, one bug fix, one pci id addition patch

  i915:
     one suspend/resume regression fix.

  All seems quiet enough."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: don't do mst probing if MST isn't enabled.
  drm/radeon: add new bonaire pci id
  drm/radeon: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling
  drm/i915: Avoid GPU hang when coming out of s3 or s4
Diffstat (limited to 'firmware/e100')
0 files changed, 0 insertions, 0 deletions