tree 9216a285bfe23aa799ca6efa01a3f4063d798e64
parent 4387ff75f29412a234d394b0276c2b239d3d3844
parent dc2e2f33bbf07344995357314fd8887f6564dba7
author David S. Miller <davem@sunset.davemloft.net> 1170977118 -0800
committer David S. Miller <davem@sunset.davemloft.net> 1170977118 -0800

Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

Conflicts:

	crypto/Kconfig