Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:42:21 +0000 (15:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:42:21 +0000 (15:42 -0700)
commit95619be590638bd48469ac81c0f6236f349f5640
treea1bc40a2b6428ff5124113e6160944e6c0f461e2
parent03cd3739818d3fa7f973d0fb6d3aa63122ea00a0
parent0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db
Merge git://git./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.