From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2015 18:44:30 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c4d0bcc228dd39e1f2286685d6224d436da6622e;p=linux-beck.git

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
---

c4d0bcc228dd39e1f2286685d6224d436da6622e