From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Apr 2013 03:19:50 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: firefly_0821_release~3680^2~759
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d02a9a89db3437467de45a451739e520877f4a48;p=firefly-linux-kernel-4.4.55.git

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
---

d02a9a89db3437467de45a451739e520877f4a48