projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8f2b54 1812a3d)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Apr 2013 00:41:26 +0000 (17:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Apr 2013 00:41:26 +0000 (17:41 -0700)
commit49b442caa4ed719aa7e2522cdd5c8abf8607b860
treedcc105e45ae1b7669302731a9e4574fb853b4128tree | snapshot
parente8f2b548de7ae65e17ee911e54712a3f26f69c60commit | diff
parent1812a3db0874be1d1524086da9e84397b800f546commit | diff
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
Domain: SCM / Uncategorized;