diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-25 18:17:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-25 18:17:38 -0700 |
| commit | b401796c95feb9faad4065633abf90270a39fc06 (patch) | |
| tree | 6b5fcdd58150cc5364cf687c921be530cd83ecac /mm/migrate.c | |
| parent | Merge tag 'sound-3.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | drm/radeon: fix cut and paste issue for hawaii. (diff) | |
| download | linux-dev-b401796c95feb9faad4065633abf90270a39fc06.tar.xz linux-dev-b401796c95feb9faad4065633abf90270a39fc06.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"This is radeon and intel fixes, and is a small bit larger than I'm
guessing you'd like it to be.
- i915: fixes 32-bit highmem i915 blank screen, semaphore hang and
runtime pm fix
- radeon: gpuvm stability fix for hangs since 3.15, and hang/reboot
regression on TN/RL devices,
The only slightly controversial one is the change to use GB for the
vm_size, which I'm letting through as its a new interface we defined
in this merge window, and I'd prefer to have the released kernel have
the final interface rather than changing it later"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: fix cut and paste issue for hawaii.
drm/radeon: fix irq ring buffer overflow handling
drm/i915: Simplify i915_gem_release_all_mmaps()
drm/radeon: fix error handling in radeon_vm_bo_set_addr
drm/i915: fix freeze with blank screen booting highmem
drm/i915: Reorder the semaphore deadlock check, again
drm/radeon/TN: only enable bapm on MSI systems
drm/radeon: fix VM IB handling
drm/radeon: fix handling of radeon_vm_bo_rmv v3
drm/radeon: let's use GB for vm_size (v2)
Diffstat (limited to 'mm/migrate.c')
0 files changed, 0 insertions, 0 deletions