Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jun 2012 18:26:50 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jun 2012 18:26:50 +0000 (11:26 -0700)
commitd1346a6cbabf6d377d753f1adc16cb0b305830cc
tree06ab828fc8d51eac9a8d04d1fdb91c51d2939623
parent60d2c25251cac20d8c142a03e230237528b68430
parent9bd0c15fcfb42f6245447c53347d65ad9e72080b
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Just two changes: one udl endian fix, one nouveau memory corruption on
  some GPUs."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/fbcon: using nv_two_heads is not a good idea
  drm/udl: Make sure to get correct endian keys from vendor descriptor