From: Dave Airlie Date: Mon, 8 Apr 2013 23:28:55 +0000 (+1000) Subject: Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau... X-Git-Tag: v3.9-rc7~31^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c9cdee17653409dedeb65c0733a253f6fe3fc7d6;p=linux.git 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 --- c9cdee17653409dedeb65c0733a253f6fe3fc7d6