[git pull] drm nouveau fix

[Dave Airlie]

Hi Linus,

just a spare semicolon in nouveau that caused some issues.

Dave.

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 c9cdee17653409dedeb65c0733a253f6fe3fc7d6:

  Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2013-04-09 09:28:55 +1000)

----------------------------------------------------------------

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

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/nouveau/nv50_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)