OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jan 2018 23:49:02 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jan 2018 23:49:02 +0000 (15:49 -0800)
commitf16549530924abd60554358283ed20e0203494f9
tree03dc821a584f83f41abbece9703c19c36a223986
parent3eab2ad9162e7467c988b91f50395eac51a1e650
parentaebb48f5e465772576359c1705c4a84abea92027
Merge git://git./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