]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge