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)
commit864f83a1f65bc8614705fc7c053969bb09939215
tree09193cd44525e6cc542cb289106a1067f83264a1
parent8005c49d9aea74d382f474ce11afbbc7d7130bec
parent176155dac13f528e0a58c14dc322623219365d91
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

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