tree c1a93de1487a69c2fc0ee165b882bf4c896e0e72
parent 53e3ccfd153f0e71352b34a930e231ac1ae07d5e
parent 3acc84739dd5d746840f881ad4d60bd2a428f1dd
author Linus Torvalds <torvalds@linux-foundation.org> 1321062002 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321062002 -0200

Merge git://github.com/herbertx/crypto

* git://github.com/herbertx/crypto:
  crypto: algapi - Fix build problem with NET disabled
  crypto: user - Fix rwsem leak in crypto_user