From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Feb 2010 20:48:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.33-rc7~40
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=489b24f2cbdcc1c93f55a2707733bba702ba8dbf;p=linux.git

Merge git://git.kernel.org/pub/scm/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
---

489b24f2cbdcc1c93f55a2707733bba702ba8dbf