tree 20254d20758d2410d9caa68fa1786b71a4225875
parent e8a91e0e872c52d2af62ae2cf30b6aef1da1ae52
parent f3c400ef473e00c680ea713a66196b05870b3710
author Linus Torvalds <torvalds@linux-foundation.org> 1406572530 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1406572530 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull ARM AES crypto fixes from Herbert Xu:
 "This push fixes a regression on ARM where odd-sized blocks supplied to
  AES may cause crashes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm-aes - fix encryption of unaligned data
  crypto: arm64-aes - fix encryption of unaligned data