| commit | 02c0241b600e4ab8a732c89749e252165145d60c | [log] [tgz] |
|---|---|---|
| author | Herbert Xu <herbert@gondor.apana.org.au> | Fri Jun 21 15:13:27 2013 +0800 |
| committer | Herbert Xu <herbert@gondor.apana.org.au> | Fri Jun 21 15:13:27 2013 +0800 |
| tree | 16110074230e4061496b5af84222abff4acb309b | |
| parent | da5ffe11342a0ecf2cce7000a9392c9ca959e9c8 [diff] | |
| parent | fe6510b5d6349a8999b83ef7c5671e5a561b803a [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto Merge crypto to resolve conflict in crypto/Kconfig.