]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4fb9188a8e1c71eecfd40b4022fce290bbd5710f
tree03dc821a584f83f41abbece9703c19c36a223986
parentce813e4d89d973fb9db9b3d55b9a27c6711bbe24
parent17ed23c88ce367d47479e560513ec5bf2158f291
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