]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 6 Mar 2014 22:41:12 +0000 (08:41 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 6 Mar 2014 22:41:12 +0000 (08:41 +1000)
a few more radeon fixes.

* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dpm: fix typo in EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters
  drm/radeon/cik: fix typo in documentation
  drm/radeon: silence GCC warning on 32 bit
  drm/radeon: resume old pm late
  drm/radeon: TTM must be init with cpu-visible VRAM, v2


Trivial merge