diff options
author | 2008-12-04 21:39:21 -0800 | |
---|---|---|
committer | 2008-12-04 21:39:21 -0800 | |
commit | 56d18e9932ebf4e8eca42d2ce509450e6c9c1666 (patch) | |
tree | cb7d041749cfc54754ba2f9f1cdb7c2037739c65 /include/linux/pci.h | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
parent | MIPS: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere. (diff) | |
download | linux-dev-56d18e9932ebf4e8eca42d2ce509450e6c9c1666.tar.xz linux-dev-56d18e9932ebf4e8eca42d2ce509450e6c9c1666.zip |
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/linux/pci.h')
0 files changed, 0 insertions, 0 deletions