tree a1bc40a2b6428ff5124113e6160944e6c0f461e2
parent 03cd3739818d3fa7f973d0fb6d3aa63122ea00a0
parent 0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db
author Linus Torvalds <torvalds@linux-foundation.org> 1275604941 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275604941 -0700

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.