projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a389b6a 2064db7)
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2...
authorDave Airlie <airlied@gmail.com>
Wed, 15 Aug 2012 10:31:22 +0000 (20:31 +1000)
committerDave Airlie <airlied@gmail.com>
Wed, 15 Aug 2012 10:31:22 +0000 (20:31 +1000)
commit2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48
tree292356971e07592630e1ad70929add156baff01ctree | snapshot
parenta389b6a1564b7c4147fa5ce51e0aad63b5e8ebd1commit | diff
parent2064db725cc6d4ea19a24c138bc37939b63e3ae6commit | diff
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
Domain: System / Uncategorized;