diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-01 18:28:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-01 18:28:58 -0700 |
commit | 568180a517aee88a8afdc9938f6884e047a2613f (patch) | |
tree | 590d53cc7df9a7ca217801d6d72ee44acdb63f88 /fs/ext4/acl.c | |
parent | 32439700fe1c0fc3c2d3f2aedd3ad6707c88b8ba (diff) | |
parent | f3f0d95146901a94eff8fe723eef2a6daf0ae152 (diff) | |
download | blackbird-op-linux-568180a517aee88a8afdc9938f6884e047a2613f.tar.gz blackbird-op-linux-568180a517aee88a8afdc9938f6884e047a2613f.zip |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"A fair number of fixes across the field. Nothing terribly
complicated; the one liners in below changelog should be fairly
descriptive.
Noteworthy is the SB1 change which the result of changes to binutils
resulting in one big gas warning for most files being assembled as
well as the asid_cache and branch emulation fixes which fix corruption
or possible uninteded behaviour of kernel or application code. The
remainder of fixes are more platforms or subsystem specific"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: R46000: Fix Micro-assembler field overflow for R4600 V2
MIPS: ptrace: Avoid smp_processor_id() in preemptible code
MIPS: Lemote 2F: cs5536: mfgpt: use raw locks
MIPS: SB1: Fix excessive kernel warnings.
MIPS: RC32434: fix broken PCI resource initialization
MIPS: malta: memory.c: Initialize the 'memsize' variable
MIPS: Fix typo when reporting cache and ftlb errors for ImgTec cores
MIPS: Fix inconsistancy of __NR_Linux_syscalls value
MIPS: Fix branch emulation of branch likely instructions.
MIPS: Fix a typo error in AUDIT_ARCH definition
MIPS: Change type of asid_cache to unsigned long
Diffstat (limited to 'fs/ext4/acl.c')
0 files changed, 0 insertions, 0 deletions