Merge git://github.com/herbertx/crypto
commit42a0ddcd484d0470d4c1b114ffb6be1d35f8ac6b
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Nov 2011 01:40:02 +0000 (11 23:40 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Nov 2011 01:40:02 +0000 (11 23:40 -0200)
treec1a93de1487a69c2fc0ee165b882bf4c896e0e72
parent53e3ccfd153f0e71352b34a930e231ac1ae07d5e
parent3acc84739dd5d746840f881ad4d60bd2a428f1dd
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