summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-31 10:01:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-31 10:01:34 -0700
commit5196626dae54fdb5bee89fdd1232b2e03cc60956 (patch)
tree1f831f5559bf70693e545447c724283330bd6156 /drivers/gpu/drm/i915/i915_dma.c
parent48418bb6e33f6b7f9a306a68414c0f72a2da9181 (diff)
parent4c63f83c2c2e16a13ce274ee678e28246bd33645 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This adds missing SELinux labeling to AF_ALG sockets which apparently causes SELinux (or at least the SELinux people) to misbehave :)" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: af_alg - properly label AF_ALG socket
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
0 files changed, 0 insertions, 0 deletions