From: Dave Airlie Date: Mon, 20 Jun 2011 02:02:38 +0000 (+1000) Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... X-Git-Tag: Ubuntu-5.2.0-15.16~20398^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ca295e50c2805865fd1ac8916d15ab0b551d957a;p=mirror_ubuntu-eoan-kernel.git Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync drm/nv50/disp: fix gamma with page flipping overlay turned on drm/nouveau/pm: Prevent overflow in nouveau_perf_init() drm/nouveau: fix big-endian switch --- ca295e50c2805865fd1ac8916d15ab0b551d957a