Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Apr 2013 03:19:50 +0000 (20:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Apr 2013 03:19:50 +0000 (20:19 -0700)
commitd02a9a89db3437467de45a451739e520877f4a48
treea5cbd992bb3ee41470fbe6d5bbd16d4fdb960ef2
parent49b442caa4ed719aa7e2522cdd5c8abf8607b860
parentd47cbd5bcee7c7a08fc0283dda465375fa1b1fda
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a GCM bug that breaks IPsec and a compile problem in
  ux500."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ux500 - add missing comma
  crypto: gcm - fix assumption that assoc has one segment