diff options
| author | Linus Torvalds <[email protected]> | 2012-06-26 18:26:50 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-06-26 18:26:50 +0000 |
| commit | d1346a6cbabf6d377d753f1adc16cb0b305830cc (patch) | |
| tree | 06ab828fc8d51eac9a8d04d1fdb91c51d2939623 /fs/jbd2/commit.c | |
| 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 | kernel-d1346a6cbabf6d377d753f1adc16cb0b305830cc.tar.gz kernel-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 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions