From: David S. Miller <davem@sunset.davemloft.net>
Date: Sun, 15 Jul 2007 06:47:04 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.23-rc1~1054^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09f51b6997f3f443c5741bc696651e479576715;p=pandora-kernel.git

Merge /pub/scm/linux/kernel/git/herbert/crypto-2.6

Conflicts:

	crypto/Kconfig
---

d09f51b6997f3f443c5741bc696651e479576715
Reading git-diff-tree failed