From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2010 17:55:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~19860
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c0caf7bcbfedb3f79ccec759b221bfef0646ada3;p=mirror_ubuntu-artful-kernel.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: padlock - Fix AES-CBC handling on odd-block-sized input
  crypto: n2 - dubious error check
---

c0caf7bcbfedb3f79ccec759b221bfef0646ada3