From: Linus Torvalds <torvalds@linux-foundation.org>
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~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49b442caa4ed719aa7e2522cdd5c8abf8607b860;p=platform%2Fkernel%2Flinux-amlogic.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