tree df052578f1e93f42dd7ccd3b7118dc36f5550948
parent 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39
parent de0babd60d8d43b58fd06a7803151d32cb589af0
author Linus Torvalds <torvalds@linux-foundation.org> 1360685855 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1360685855 -0800

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

Pull drm fixes from Dave Airlie:
 "Three nouveau fixes, all user visible issues, and one radeon
  regression fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: enforce use of radeon_get_ib_value when reading user cmd
  drm/nouveau: add lockdep annotations
  drm/nv50/fb: Fix nullptr-deref on IGPs
  drm/nouveau: use different register to wait for secret scrubber