tree 7287dd108d7566761a14b423f85c6cf770f03e9c
parent 4ced08b89f591521c3d2e3e87ab914016e6b7d94
parent f4c4cd6d14e3a3f638475f2f83e26765a7d3327b
author Linus Torvalds <torvalds@linux-foundation.org> 1220914272 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220914272 -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:
  Revert "crypto: camellia - Use kernel-provided bitops, unaligned access helpers"