tree e41b1a684421cf52a2db271ab3c34a4fe9ff7bbe
parent f011a08c804d50eeff4abf2d308cdce492f015aa
parent b1ea3e6e3883c5191caa5be72b3a5b9c32812e38
author Dave Airlie <airlied@redhat.com> 1365463735 +1000
committer Dave Airlie <airlied@redhat.com> 1365463735 +1000

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