Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 May 2012 00:14:55 +0000 (17:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 May 2012 00:14:55 +0000 (17:14 -0700)
commitf5645b5959c002303fd2480e7bcde2b5232b8f86
tree3c6e8ea54e708e76bce724bdb60e6b5eac60c1fa
parentc42f1d4b523950c4af060f8fc0c7016755d8a3bc
parentaddde4ec31456c5f1e9b61aae3edcfeb0f338f87
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Just some regression fixes from Ben along with a variable that gcc
  failed to spot is uninitialised."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  nouveau: initialise has_optimus variable.
  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