tree b515c760f6eba432f05625b417612550c755efe5
parent 5de1ccbe51e89c51a2fe5ab333b7c9c2e7294aff
parent 0d44dc59b2b434b29aafeae581d06f81efac7c83
author Linus Torvalds <torvalds@linux-foundation.org> 1238777153 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238777153 -0700

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:
  crypto: ixp4xx - Fix handling of chained sg buffers
  crypto: shash - Fix unaligned calculation with short length
  hwrng: timeriomem - Use phys address rather than virt