summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-08-15 12:31:22 +0200
committerDave Airlie <airlied@gmail.com>2012-08-15 12:31:22 +0200
commit2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48 (patch)
tree292356971e07592630e1ad70929add156baff01c /block
parentMerge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-in... (diff)
parentdrm/nv86/fifo: suspend fix (diff)
downloadlinux-2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48.tar.xz
linux-2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48.zip
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
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions