From: Mark Brown <broonie@kernel.org>
Date: Thu, 29 Apr 2021 15:11:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/for-5.13' into spi-linus
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=eb43e665d243d0d789b28ef0f995a232ed3c5012;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'spi/for-5.13' into spi-linus
---

eb43e665d243d0d789b28ef0f995a232ed3c5012
diff --cc MAINTAINERS
index 9450e052f1b13,1c98272079492..299a9f458e3ae
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8122,8 -8115,16 +8123,15 @@@ F:	drivers/crypto/hisilicon/sec2/sec_cr
  F:	drivers/crypto/hisilicon/sec2/sec_crypto.h
  F:	drivers/crypto/hisilicon/sec2/sec_main.c
  
+ HISILICON SPI Controller DRIVER FOR KUNPENG SOCS
+ M:	Jay Fang <f.fangjian@huawei.com>
+ L:	linux-spi@vger.kernel.org
+ S:	Maintained
+ W:	http://www.hisilicon.com
+ F:	drivers/spi/spi-hisi-kunpeng.c
+ 
  HISILICON STAGING DRIVERS FOR HIKEY 960/970
  M:	Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 -L:	devel@driverdev.osuosl.org
  S:	Maintained
  F:	drivers/staging/hikey9xx/