tree 06ab828fc8d51eac9a8d04d1fdb91c51d2939623
parent 60d2c25251cac20d8c142a03e230237528b68430
parent 9bd0c15fcfb42f6245447c53347d65ad9e72080b
author Linus Torvalds <torvalds@linux-foundation.org> 1340735210 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1340735210 -0700

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