From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Aug 2015 18:13:54 +0000 (-0700)
Subject: Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux
X-Git-Tag: firefly_0821_release~176^2~1287
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04da002d98852b38083beb9725967609945a8747;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux

Pull amd drm fixes from Alex Deucher:
 "Dave is on vacation at the moment, so please pull these radeon and
  amdgpu fixes directly.

  Just a few minor things for 4.2:

   - add a new radeon pci id
   - fix a power management regression in amdgpu
   - fix HEVC command buffer validation in amdgpu"

* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: add new OLAND pci id
  Revert "drm/amdgpu: Configure doorbell to maximum slots"
  drm/amdgpu: add context buffer size check for HEVC
---

04da002d98852b38083beb9725967609945a8747