Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau...
authorDave Airlie <airlied@redhat.com>
Mon, 8 Apr 2013 23:28:55 +0000 (09:28 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 8 Apr 2013 23:28:55 +0000 (09:28 +1000)
commitc9cdee17653409dedeb65c0733a253f6fe3fc7d6
treee41b1a684421cf52a2db271ab3c34a4fe9ff7bbe
parentf011a08c804d50eeff4abf2d308cdce492f015aa
parentb1ea3e6e3883c5191caa5be72b3a5b9c32812e38
Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

too many semicolons.

* 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: fix unconditional return waiting on memory