]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Nov 2015 17:40:05 +0000 (09:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Nov 2015 17:40:05 +0000 (09:40 -0800)
Pull crypto fix from Herbert Xu:
 "This fixes a bug in the qat driver where a user-space pointer is
  dereferenced"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - don't use userspace pointer


Trivial merge