| commit | f16549530924abd60554358283ed20e0203494f9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 24 15:49:02 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 24 15:49:02 2018 -0800 |
| tree | 03dc821a584f83f41abbece9703c19c36a223986 | |
| parent | 3eab2ad9162e7467c988b91f50395eac51a1e650 [diff] | |
| parent | aebb48f5e465772576359c1705c4a84abea92027 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc Pull sparc bugfix from David Miller: "Sparc Makefile typo fix" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64