From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 8 Feb 2007 23:25:18 +0000 (-0800)
Subject: Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.21-rc1~83^2~65^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6;p=pandora-kernel.git

Merge branch 'HEAD' of /linux/kernel/git/herbert/crypto-2.6

Conflicts:

	crypto/Kconfig
---

9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6
Reading git-diff-tree failed