From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jun 2010 22:42:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: Ubuntu-5.10.0-12.13~28091
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=95619be590638bd48469ac81c0f6236f349f5640;p=mirror_ubuntu-hirsute-kernel.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: crypto4xx - Fix build breakage
  n2_crypto: Plumb fallback ahash requests properly.
  n2_crypto: Fix MAU kmem_cache name.
  n2_crypto: Fix build after of_device/of_platform_driver changes.
---

95619be590638bd48469ac81c0f6236f349f5640