arent 4dab75ec3ebf28583fc902ac946b287b5acdbcad
parent cd1510cb5f892907fe1a662f90b41fb3a42954e0
author Linus Torvalds <torvalds@linux-foundation.org> 1265143729 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265143729 -0800

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
˜]¼
œ