From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 May 2014 23:10:28 +0000 (+1000)
Subject: Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm... 
X-Git-Tag: MMI-PSA29.97-13-9~12242^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=995c376e89992e756cf844b86209eb4ceb5ebe27;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes

Add Mullins chips support.

* 'mullins' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: add pci ids for Mullins
  drm/radeon: add Mullins VCE support
  drm/radeon: modesetting updates for Mullins.
  drm/radeon: dpm updates for KV/KB
  drm/radeon: add Mullins dpm support.
  drm/radeon: add Mullins UVD support.
  drm/radeon: update cik init for Mullins.
  drm/radeon: add Mullins chip family
---

995c376e89992e756cf844b86209eb4ceb5ebe27