diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 12:45:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 12:45:41 -0800 |
| commit | a4a26e8e924a8e2412b63276c1a23cc127997a73 (patch) | |
| tree | 28f2774c581722cd1e488a46b8ffda1b05eb1e76 /MAINTAINERS | |
| parent | f3f62a38ceda4e4d34a1dc3ebbc0f8d426c9e8d9 (diff) | |
| parent | 2b2b4074e647f4e88c9601e14f834f4a3a379d2a (diff) | |
| download | linux-a4a26e8e924a8e2412b63276c1a23cc127997a73.tar.gz | |
Merge tag 'nios2-v3.19-rc1' of git://git.rocketboards.org/linux-socfpga-next
Pull Altera Nios II processor support from Ley Foon Tan: "Here is the Linux port for Nios II processor (from Altera) arch/nios2/ tree for v3.19. The patchset has been discussed on the kernel mailing lists since April and has gone through 6 revisions of review. The additional changes since then have been mostly further cleanups and fixes when merged with other trees. The arch code is in arch/nios2 and one asm-generic change (acked by Arnd)" Arnd Bergmann says: "I've reviewed the architecture port in the past and it looks good in its latest version" Acked-by: Arnd Bergmann <arnd@arndb.de> * tag 'nios2-v3.19-rc1' of git://git.rocketboards.org/linux-socfpga-next: (40 commits) nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL nios2: Add missing NR_CPUS to Kconfig nios2: asm-offsets: Remove unused definition TI_TASK nios2: Remove write-only struct member from nios2_timer nios2: Remove unused extern declaration of shm_align_mask nios2: include linux/type.h in io.h nios2: move include asm-generic/io.h to end of file nios2: remove include asm-generic/iomap.h from io.h nios2: remove unnecessary space before define nios2: fix error handling of irq_of_parse_and_map nios2: Use IS_ENABLED instead of #ifdefs to check config symbols nios2: Build infrastructure Documentation: Add documentation for Nios2 architecture MAINTAINERS: Add nios2 maintainer nios2: ptrace support nios2: Module support nios2: Nios2 registers nios2: Miscellaneous header files nios2: Cpuinfo handling nios2: Time keeping ...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8ef028d3afc7..32af1a0f7628 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6562,6 +6562,13 @@ S: Maintained F: Documentation/scsi/NinjaSCSI.txt F: drivers/scsi/nsp32* +NIOS2 ARCHITECTURE +M: Ley Foon Tan <lftan@altera.com> +L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers) +T: git git://git.rocketboards.org/linux-socfpga.git +S: Maintained +F: arch/nios2/ + NTB DRIVER M: Jon Mason <jdmason@kudzu.us> M: Dave Jiang <dave.jiang@intel.com> |