tree 474f0d29edc8405a14e23383e2b0afc0f325a1ee
parent afa3b60c905f606e8245115474d77787035e02eb
parent 8b281db596744a15b2abbfdbf655796c64e172ca
author Dave Airlie <airlied@redhat.com> 1275355949 +1000
committer Dave Airlie <airlied@redhat.com> 1275355949 +1000

Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing

* 'nouveau/for-airlied' of ../drm-nouveau-next:
  drm/nv50: cast IGP memory location to u64 before shifting
  drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack
  drm/nouveau: fix dual-link displays when plugged into single-link outputs
  drm/nv50: obey dcb->duallink_possible
  drm/nv50: fix duallink_possible calculation for DCB 4.0 cards
  drm/nouveau: don't execute INIT_GPIO unless we're really running the table
  drm/nv40: allow cold-booting of nv4x chipsets
  drm/nouveau: fix POST detection for certain chipsets
  drm/nouveau: Add getparam for current PTIMER time.
  drm/nouveau: allow cursor image and position to survive suspend