diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 20:19:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 20:19:50 -0700 |
| commit | d02a9a89db3437467de45a451739e520877f4a48 (patch) | |
| tree | a5cbd992bb3ee41470fbe6d5bbd16d4fdb960ef2 /drivers/clk/ux500/abx500-clk.c | |
| parent | 49b442caa4ed719aa7e2522cdd5c8abf8607b860 (diff) | |
| parent | d47cbd5bcee7c7a08fc0283dda465375fa1b1fda (diff) | |
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/clk/ux500/abx500-clk.c')
0 files changed, 0 insertions, 0 deletions