Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jun 2013 16:28:39 +0000 (06:28 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jun 2013 16:28:39 +0000 (06:28 -1000)
commit92616ee65422d03930816250cb1e6ce7493cf14d
tree648ceee001f717be24058a4dad6b27f8232f9532
parent7ecba6f2f3f6e862287e07908ba583199c7772a9
parentfe6510b5d6349a8999b83ef7c5671e5a561b803a
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes an unaligned crash in XTS mode when using aseni_intel"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni_intel - fix accessing of unaligned memory