| commit | d09f51b6997f3f443c5741bc696651e479576715 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@sunset.davemloft.net> | Sat Jul 14 23:47:04 2007 -0700 |
| committer | David S. Miller <davem@sunset.davemloft.net> | Sat Jul 14 23:47:04 2007 -0700 |
| tree | 6d5eefcbaa9f46d44e8cad626011e886b5d1840c | |
| parent | 1b1ac759d7c6bba6e5f4731ef6ea720b6636e27c [diff] | |
| parent | e559e91cce3af215d78b7262360f19b95978aab3 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 Conflicts: crypto/Kconfig