summaryrefslogtreecommitdiff
path: root/crypto/api.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-27 05:23:15 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-27 05:23:15 (GMT)
commit1a506e473576cdcb922d339aea76b67d0fe344f7 (patch)
treea92289ddf4a7480dd75328321be9c421da74a959 /crypto/api.c
parent34a08681832f835269670b1d72e45f48b014375f (diff)
parent426729dcc713b3d1ae802e314030e5556a62da53 (diff)
downloadlinux-1a506e473576cdcb922d339aea76b67d0fe344f7.tar.xz
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 'crypto/api.c')
0 files changed, 0 insertions, 0 deletions