]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0c2e1eefcb71e151658ac338a792d8b4920a962b
treedcc105e45ae1b7669302731a9e4574fb853b4128
parent1759e8f720e2edc0a0e8ebfd6d032f9a16fa374a
parent694a4ad2c90271bebc8017f85a0ce1b82eca4c64
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