[git pull] drm nouveau fix

[Dave Airlie]

> Hi Linus,
> 
> just a spare semicolon in nouveau that caused some issues.

Okay an mgag200 fix I missed is also in there now.

The following changes since commit f011a08c804d50eeff4abf2d308cdce492f015aa:

  Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes (2013-04-08 16:10:43 -0700)

are available in the git repository at:


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

for you to fetch changes up to 1812a3db0874be1d1524086da9e84397b800f546:

  drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal. (2013-04-10 09:48:24 +1000)

----------------------------------------------------------------
Calvin Owens (1):
      drm/nouveau: fix unconditional return waiting on memory

Christopher Harvey (1):
      drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal.

Dave Airlie (1):
      Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

 drivers/gpu/drm/mgag200/mgag200_mode.c | 13 +++----------
 drivers/gpu/drm/nouveau/nv50_display.c |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)