Commit a4feff22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull arch/nios2 fixlet from Ley Foon Tan:
 "Update my nios2 maintainer email"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  MAINTAINERS: Update Ley Foon Tan's email address
parents 51d69817 051d75d3

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ F: Documentation/devicetree/bindings/i2c/i2c-altera.txt 
F:	drivers/i2c/busses/i2c-altera.c









ALTERA MAILBOX DRIVER









M:	Ley Foon Tan <lftan@altera.com>









M:	Ley Foon Tan <ley.foon.tan@intel.com>









L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)









S:	Maintained









F:	drivers/mailbox/mailbox-altera.c








@@ -11680,7 +11680,7 @@ F:	Documentation/scsi/NinjaSCSI.txt







F:	drivers/scsi/nsp32*

















NIOS2 ARCHITECTURE









M:	Ley Foon Tan <lftan@altera.com>









M:	Ley Foon Tan <ley.foon.tan@intel.com>









L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git









S:	Maintained








@@ -12564,7 +12564,7 @@ F:	Documentation/devicetree/bindings/pci/aardvark-pci.txt







F:	drivers/pci/controller/pci-aardvark.c

















PCI DRIVER FOR ALTERA PCIE IP









M:	Ley Foon Tan <lftan@altera.com>









M:	Ley Foon Tan <ley.foon.tan@intel.com>









L:	rfi@lists.rocketboards.org (moderated for non-subscribers)









L:	linux-pci@vger.kernel.org









S:	Supported








@@ -12743,7 +12743,7 @@ S:	Supported







F:	Documentation/PCI/pci-error-recovery.rst

















PCI MSI DRIVER FOR ALTERA MSI IP









M:	Ley Foon Tan <lftan@altera.com>









M:	Ley Foon Tan <ley.foon.tan@intel.com>









L:	rfi@lists.rocketboards.org (moderated for non-subscribers)









L:	linux-pci@vger.kernel.org









S:	Supported