From: Linus Torvalds Date: Wed, 10 Apr 2013 00:41:26 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Tag: v3.9-rc7~31 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=49b442caa4ed719aa7e2522cdd5c8abf8607b860;p=cascardo%2Flinux.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull drm fixes from Dave Airlie: "Just a spare semicolon in nouveau that caused some issues, and an mgag200 fix" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal. drm/nouveau: fix unconditional return waiting on memory --- 49b442caa4ed719aa7e2522cdd5c8abf8607b860