From: Dave Airlie Date: Thu, 1 Dec 2011 09:01:55 +0000 (+0000) Subject: Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2... X-Git-Tag: v3.2-rc5~54^2~8 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=4f3e0b1d33bfeb1e05e53073c6f277176ff9e368 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/nv50/disp: silence compiler warning drm/nouveau: fix oopses caused by clear being called on unpopulated ttms drm/nouveau: Keep RAMIN heap within the channel. drm/nvd0/disp: fix sor dpms typo, preventing dpms on in some situations drm/nvc0/gr: fix TP init for transform feedback offset queries drm/nouveau: add dumb ioctl support --- 4f3e0b1d33bfeb1e05e53073c6f277176ff9e368