Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2010 20:48:49 +0000 (12:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2010 20:48:49 +0000 (12:48 -0800)
commit489b24f2cbdcc1c93f55a2707733bba702ba8dbf
tree338a574de2e7913a3057f148b047f5ce37d31ba6
parent4dab75ec3ebf28583fc902ac946b287b5acdbcad
parentcd1510cb5f892907fe1a662f90b41fb3a42954e0
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  random: Remove unused inode variable
  crypto: padlock-sha - Add import/export support
  random: drop weird m_time/a_time manipulation