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)
* 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


Trivial merge