From: Dave Airlie Date: Wed, 15 Aug 2012 10:31:22 +0000 (+1000) Subject: Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48;p=linux-beck.git 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 --- 2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48