Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 1 Feb 2012 09:36:24 +0000 (09:36 +0000)
committerDave Airlie <airlied@redhat.com>
Wed, 1 Feb 2012 09:36:24 +0000 (09:36 +0000)
commitebd80b941c72f9da9ffd54de70cc094b0511f26f
tree6e17ed7bc6158d103fbe558b5ec84c292021d9f9
parent62aa2b537c6f5957afd98e29f96897419ed5ebab
parenta9d993882008a1ae2c953064f0c2ca7e604b1333
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/nv50/pm: signedness bug in nv50_pm_clocks_pre()
  drm/nouveau/gem: fix fence_sync race / oops
  drm/nouveau: fix typo on mxmdcb option
  drm/nouveau/mxm: pretend to succeed, even if we can't shadow the MXM-SIS
  drm/nouveau/disp: check that panel power gpio is enabled at init time