Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 01:10:54 +0000 (18:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 01:10:54 +0000 (18:10 -0700)
commit0e47427bc50bd34bd405e207ccf5235f3b78b551
tree2842deb0af7019a8dbdb333eabbe5f8cab7930a3
parentc017d0d1351f916c0ced3f358afc491fdcf490b4
parenta18b989a5c12ca82ed37f94279273ddbc073758a
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix operator precedence in shared descriptor allocation