tree 8dc7397da40218c367e6e7cd26dce875a57e0a38
parent 4203afc3fb0c5dd4ced24ee116f31ec591f7c5c7
parent 970fa986fadb1165cf38b45b70e98302a3bee497
author Linus Torvalds <torvalds@linux-foundation.org> 1369980245 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1369980245 +1000

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

Pull drm fixes from Dave Airlie:
 "One qxl 32-bit warning fix, the rest is a bunch of radeon fixes from
  Alex for some issues we've been seeing."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/qxl: fix build warnings on 32-bit
  radeon: use max_bus_speed to activate gen2 speeds
  drm/radeon: narrow scope of Apple re-POST hack
  drm/radeon: don't check crtcs in card_posted() on cards without DCE
  drm/radeon: fix card_posted check for newer asics
  drm/radeon: fix typo in cu_per_sh on verde
  drm/radeon: UVD block on SUMO2 is the same as on SUMO