tree aaac7c2858dab9817af579f2ad39f2f18ce4dbd8
parent 143418d0c87fda0c587205c45094d8b05222fd49
parent 5219a5342ab13650ae0f0c62319407268c48d0ab
author Linus Torvalds <torvalds@linux-foundation.org> 1333384824 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1333384824 -0700

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

Pull crypto fixes from Herbert Xu:
 - Fix for CPU hotplug hang in padata.
 - Avoid using cpu_active inappropriately in pcrypt and padata.
 - Fix for user-space algorithm lookup hang with IV generators.
 - Fix for netlink dump of algorithms where stuff went missing due to
   incorrect calculation of message size.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: user - Fix size of netlink dump message
  crypto: user - Fix lookup of algorithms with IV generator
  crypto: pcrypt - Use the online cpumask as the default
  padata: Fix cpu hotplug
  padata: Use the online cpumask as the default
  padata: Add a reference to the api documentation