diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 11:51:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 11:51:13 -0700 |
| commit | 554e6e9f816bdf08c2962e6f003f8298c935646b (patch) | |
| tree | 8adb0eb9738b86b0ce038acb227df1e915cf378f /arch/score | |
| parent | 17d8dfcda6ce570ddc4844f490104fed4af215aa (diff) | |
| parent | cdfce53986a39daf039b62b69026867734d8430a (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"MIPS fixes across the field. The only area that's standing out is the
exception handling which received it's dose of breakage as part of the
microMIPS patchset"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ralink: add missing SZ_1M multiplier
MIPS: Compat: Fix cputime_to_timeval() arguments in compat binfmt_elf.
MIPS: OCTEON: Improve _machine_halt implementation.
MIPS: rtlx: Fix implicit declaration of function set_vi_handler()
MIPS: Trap exception handling fixes
MIPS: Quit exposing Kconfig symbols in uapi headers.
MIPS: Remove duplicate definition of check_for_high_segbits.
Diffstat (limited to 'arch/score')
0 files changed, 0 insertions, 0 deletions