From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Nov 2015 17:40:05 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: firefly_0821_release~176^2~676
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=864f83a1f65bc8614705fc7c053969bb09939215;p=firefly-linux-kernel-4.4.55.git

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
---

864f83a1f65bc8614705fc7c053969bb09939215