tree 15c46166d3ca73dcd264f563b927e4a29826b981
parent 0336104dcba613586cd22279db445840d4ebcdeb
parent 472313245645661c3bc710f874e660c493d313e1
author Linus Torvalds <torvalds@linux-foundation.org> 1431715470 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1431715470 -0700

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