git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@sunset.davemloft.net>
	Sun, 15 Jul 2007 06:47:04 +0000 (23:47 -0700)
committer	David S. Miller <davem@sunset.davemloft.net>
	Sun, 15 Jul 2007 06:47:04 +0000 (23:47 -0700)
commit	fd15631b43399d14f984ae0a74b6fab4c787e39f
tree	6d5eefcbaa9f46d44e8cad626011e886b5d1840c	tree \| snapshot
parent	8413259c045ffd702a50cf39ff9b1c274d2d11b7	commit \| diff
parent	7d1ba802a46b84c89a014bd76b6b00efeff71c76	commit \| diff

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

Conflicts:

crypto/Kconfig