From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Nov 2012 17:10:20 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.7-rc5~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9ca72adc1818d6e8d5f76baef71889be14ac4cd4;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This push fixes a potential panic in cryptd which may occur with
  crypto drivers such as aesni-intel."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption
---

9ca72adc1818d6e8d5f76baef71889be14ac4cd4