commit | 0e47427bc50bd34bd405e207ccf5235f3b78b551 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 29 18:10:54 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 29 18:10:54 2011 -0700 |
tree | 2842deb0af7019a8dbdb333eabbe5f8cab7930a3 | |
parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 [diff] | |
parent | a18b989a5c12ca82ed37f94279273ddbc073758a [diff] |
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: caam - fix operator precedence in shared descriptor allocation