diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-26 20:26:50 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-26 20:26:50 +0200 |
commit | d1346a6cbabf6d377d753f1adc16cb0b305830cc (patch) | |
tree | 06ab828fc8d51eac9a8d04d1fdb91c51d2939623 /scripts | |
parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | drm/nouveau/fbcon: using nv_two_heads is not a good idea (diff) | |
download | linux-d1346a6cbabf6d377d753f1adc16cb0b305830cc.tar.xz linux-d1346a6cbabf6d377d753f1adc16cb0b305830cc.zip |
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions