From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Jan 2018 23:49:02 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v4.19~1793
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f16549530924abd60554358283ed20e0203494f9;p=platform%2Fkernel%2Flinux-rpi.git

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
---

f16549530924abd60554358283ed20e0203494f9