From: Dave Airlie <airlied@redhat.com>
Date: Tue, 1 May 2012 11:25:06 +0000 (+0100)
Subject: Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e6586240a66e38dff2fbefd89451cfcdd68dceac;p=~shefty%2Frdma-dev.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/nv10/gpio: fix thinko in mask for gpio lines 2-9
  nvc0/fb: shut up PMFB interrupt after the first occurrence
  drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac
  drm/nouveau/bios: fix regression on some nv4x board
---

e6586240a66e38dff2fbefd89451cfcdd68dceac