commit 2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48
author Dave Airlie <airlied@gmail.com> Wed Aug 15 20:31:22 2012 +1000
committer Dave Airlie <airlied@gmail.com> Wed Aug 15 20:31:22 2012 +1000
tree 292356971e07592630e1ad70929add156baff01c
parent a389b6a1564b7c4147fa5ce51e0aad63b5e8ebd1
parent 2064db725cc6d4ea19a24c138bc37939b63e3ae6

Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nv86/fifo: suspend fix
  drm/nouveau: disable copy engine on NVAF
  nouveau: fixup scanout enable in nvc0_pm
  drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry
  drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate
  drm/nve0/fifo: add support for the flip completion swmthd