diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 21:39:21 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-04 21:39:21 -0800 |
commit | 56d18e9932ebf4e8eca42d2ce509450e6c9c1666 (patch) | |
tree | cb7d041749cfc54754ba2f9f1cdb7c2037739c65 /include/net/phonet | |
parent | 1cb434b20d85b90f2e5cf6cb80071069a052b1e1 (diff) | |
parent | c6cb4df96fa22d1174d6fb6dfc2c7501d7afaeea (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere.
MIPS: 64-bit: vmsplice needs to use the compat wrapper for o32 and N32.
MIPS: o32: Fix number of arguments to splice(2).
MIPS: Malta: Consolidate platform device code.
MIPS: IP22, Fulong, Malta: Update defconfigs.
MIPS: Malta: Add back RTC support
MIPS: Fix potential DOS by untrusted user app.
Diffstat (limited to 'include/net/phonet')
0 files changed, 0 insertions, 0 deletions