[git pull] drm nouveau fixes

[Dave Airlie]

Hi Linus,

just some regression fixes from Ben along with a variable that gcc failed 
to spot is uninitialised.

Dave.

The following changes since commit 655861e328cea83320190f4a57b3656ee952388c:

  Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (2012-04-30 15:34:41 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

Ben Skeggs (3):
      drm/nouveau/bios: fix regression on some nv4x board
      drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac
      drm/nv10/gpio: fix thinko in mask for gpio lines 2-9

Christoph Bumiller (1):
      nvc0/fb: shut up PMFB interrupt after the first occurrence

Dave Airlie (2):
      Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
      nouveau: initialise has_optimus variable.

 drivers/gpu/drm/nouveau/nouveau_acpi.c |    2 +-
 drivers/gpu/drm/nouveau/nouveau_bios.c |   10 +++++++---
 drivers/gpu/drm/nouveau/nouveau_hdmi.c |    4 +++-
 drivers/gpu/drm/nouveau/nv10_gpio.c    |    2 +-
 drivers/gpu/drm/nouveau/nvc0_fb.c      |    5 +++++
 5 files changed, 17 insertions(+), 6 deletions(-)