Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 20:36:58 +0000 (12:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 20:36:58 +0000 (12:36 -0800)
commitf39edadd1533713a5ed8ba31887ea6c93d137083
tree871ba2be5b4500c18a57e944fc954eb144d9ec9b
parent7ea6600148c265b1fd53e521022b1d7aec81d974
parentf5908267b67917b8cbd98b27fd2be9b5f62ec76f
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: core - Fix double unlock in rng_dev_read