]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Mon, 20 Jun 2011 02:02:38 +0000 (12:02 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 20 Jun 2011 02:02:38 +0000 (12:02 +1000)
commitca295e50c2805865fd1ac8916d15ab0b551d957a
tree765283c65226a53dea46eb1aa364a0471068fca1
parent682f1a54a03513fd6bcede56845f1ba21f48c182
parentb16a5a18ff994532120c1d18e678bbc5fb477b62
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