Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:51:12 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:51:12 +0000 (15:51 -0700)
commit6a23312bd31878db555afad98b44705fc1590896
tree7287dd108d7566761a14b423f85c6cf770f03e9c
parent4ced08b89f591521c3d2e3e87ab914016e6b7d94
parentf4c4cd6d14e3a3f638475f2f83e26765a7d3327b
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  Revert "crypto: camellia - Use kernel-provided bitops, unaligned access helpers"