diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-26 19:23:15 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-26 19:23:15 -1000 |
| commit | 1a506e473576cdcb922d339aea76b67d0fe344f7 (patch) | |
| tree | a92289ddf4a7480dd75328321be9c421da74a959 /drivers/net/ethernet/octeon/octeon_mgmt.c | |
| parent | 34a08681832f835269670b1d72e45f48b014375f (diff) | |
| parent | 426729dcc713b3d1ae802e314030e5556a62da53 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull i915 drm fixes from Dave Airlie:
"These should be the last two fixes for i915, one is for a fence leak
killing X on some older GPUs, and one is a late regression partial
revert for an swiotlb/xen/i915 interaction, Konrad has promised to
figure out the proper answer, and this patch is the best thing to do
at this stage to avoid regressing"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: make compact dma scatter lists creation work with SWIOTLB backend.
drm/i915: Restore fences after resume and GPU resets
Diffstat (limited to 'drivers/net/ethernet/octeon/octeon_mgmt.c')
0 files changed, 0 insertions, 0 deletions