diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 03:47:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 03:47:33 -0400 |
| commit | c7d6891a770aa97dd36c2df3545031e64c6a0ef3 (patch) | |
| tree | cbd2feabcf041aacc92a266ef4d870145766eb4e /MAINTAINERS | |
| parent | 6ed8bf82fe44752f748bdc19567f79a961cf916c (diff) | |
| parent | 7bb394094080a26de06efcd6a870cb2ba21cfb16 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"MIPS fixes for various loose ends:
- Fix workarounds for R4000 erratum.
- Patch up DEC, Siemens-Nixdorf and Loongson hardware support.
- Wire up renameat2 syscall.
- Delete unused file - it was causing false warnings from maintenance
scripts.
- Revert a patch because it's functionality is now implemented twice
which causes superfluous /proc/cpuinfo output.
- Fix a microMIPS regression"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: mm: Fix broken microMIPS kernel regression.
MIPS: Add new AUDIT_ARCH token for the N32 ABI on MIPS64
MIPS: Wire up renameat2 syscall.
MIPS: inst.h: Rename BITFIELD_FIELD to __BITFIELD_FIELD.
MIPS: Remove file missed when removing rm9k support a while ago.
MIPS/loongson2_cpufreq: Fix CPU clock rate setting
MIPS: Loongson: No need to select GENERIC_HARDIRQS_NO__DO_IRQ
MIPS: csum_partial.S CPU_DADDI_WORKAROUNDS bug fix
MIPS: __strncpy_from_user_asm CPU_DADDI_WORKAROUNDS bug fix
MIPS: __delay CPU_DADDI_WORKAROUNDS bug fix
MIPS: DEC/SNI: O32 wrapper stack switching fixes
MIPS: DEC: Bus error handler <asm/cpu-type.h> fixes
MAINTAINERS: TURBOchannel: Update entry
Revert "MIPS: MT: proc: Add support for printing VPE and TC ids"
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa1b13996bd3..2e4fe5450fea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -9116,6 +9116,9 @@ F: arch/um/os-Linux/drivers/ | |||
| 9116 | 9116 | ||
| 9117 | TURBOCHANNEL SUBSYSTEM | 9117 | TURBOCHANNEL SUBSYSTEM |
| 9118 | M: "Maciej W. Rozycki" <macro@linux-mips.org> | 9118 | M: "Maciej W. Rozycki" <macro@linux-mips.org> |
| 9119 | M: Ralf Baechle <ralf@linux-mips.org> | ||
| 9120 | L: linux-mips@linux-mips.org | ||
| 9121 | Q: http://patchwork.linux-mips.org/project/linux-mips/list/ | ||
| 9119 | S: Maintained | 9122 | S: Maintained |
| 9120 | F: drivers/tc/ | 9123 | F: drivers/tc/ |
| 9121 | F: include/linux/tc.h | 9124 | F: include/linux/tc.h |