Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Sat, 20 Sep 2014 07:23:37 +0000 (17:23 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 20 Sep 2014 07:23:37 +0000 (17:23 +1000)
commit92a32a4722b7c85377775f5ae987c7ae0c4ed67e
treee6695cad73abc44fbefb54d7cff2c54fa386e6e2
parentb1fb01241b515641e11263fcc628242d9aeb56ff
parent226b6d88d0c38bd0817660c79e3bea870dfeee4b
Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

single fix for regression on rs4xx/rs690/rs740
* 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page