diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-03 10:59:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-03 10:59:37 -0700 |
| commit | 73e6080547429a3cf16f2cceba54891d345f44c2 (patch) | |
| tree | dc0fb380da63f8423a6e8c474d8ea6d94b863285 /drivers/scsi/a100u2w.h | |
| parent | 2fb748d26516834eaf8bf7013d3fd0c94825a8d4 (diff) | |
| parent | 9f846a16d213523fbe6daea17e20df6b8ac5a1e5 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"One regression fix, two radeon fixes (one for an oops), and an i915
fix to unload framebuffers earlier.
We originally were going to leave the i915 fix until -next, but grub2
in some situations causes vesafb/efifb to be loaded now, and this
causes big slowdowns, and I have reports in rawhide I'd like to have
fixed."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: kick any firmware framebuffers before claiming the gtt
drm: edid: Don't add inferred modes with higher resolution
drm/radeon: fix rare segfault
drm/radeon: fix VM page table setup on SI
Diffstat (limited to 'drivers/scsi/a100u2w.h')
0 files changed, 0 insertions, 0 deletions