diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:23:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:23:42 -0500 |
| commit | b0f0c26a2ed49eccf98a011b86fe24fb9f2b35f6 (patch) | |
| tree | ad2efaa0ab0459257948127c56d4a7747cbefa11 /MAINTAINERS | |
| parent | 99fa0ad92c4fd8b529c89b3640b42323984be761 (diff) | |
| parent | d16d2be111a61baf3a4696f07bfc7a8e36697cec (diff) | |
Merge tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next
Pull arch/nios2 update from Ley Foon Tan:
"Here is the nios2 update for 3.20:
- add early printk support
- add kgdb support
- add compressed kernel support
- bugfixes"
* tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next:
nios2: add kgdb support
MAINTAINERS: update arch/nios2 git tree
nios2: default CONFIG_NIOS2_BOOT_LINK_OFFSET to 8MB
nios2: Add support for compressed kernel
nios2: add early printk support
nios2: Port OOM changes to do_page_fault()
nios2: Remove unused prepare_to_copy()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 85024e23309f..3eee4c7739ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6876,7 +6876,7 @@ F: drivers/scsi/nsp32* | |||
| 6876 | NIOS2 ARCHITECTURE | 6876 | NIOS2 ARCHITECTURE |
| 6877 | M: Ley Foon Tan <lftan@altera.com> | 6877 | M: Ley Foon Tan <lftan@altera.com> |
| 6878 | L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers) | 6878 | L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers) |
| 6879 | T: git git://git.rocketboards.org/linux-socfpga.git | 6879 | T: git git://git.rocketboards.org/linux-socfpga-next.git |
| 6880 | S: Maintained | 6880 | S: Maintained |
| 6881 | F: arch/nios2/ | 6881 | F: arch/nios2/ |
| 6882 | 6882 | ||