tree 124fa193945a660c2796859818abd35c2418c2c1
parent 2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc
parent 573471c1374e6a54a78efc1d1c047733981c99e2
author Dave Airlie <airlied@redhat.com> 1399417828 +1000
committer Dave Airlie <airlied@redhat.com> 1399417828 +1000

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