Merge remote-tracking branch 'origin/master' into next

(Pickup Stephen's fix d4d7b2a11c)
This commit is contained in:
Benjamin Herrenschmidt
2011-09-01 15:57:23 +10:00
105 changed files with 724 additions and 305 deletions

View File

@@ -171,7 +171,7 @@ SYSCALL_SPU(setresuid)
SYSCALL_SPU(getresuid)
SYSCALL(ni_syscall)
SYSCALL_SPU(poll)
COMPAT_SYS(nfsservctl)
SYSCALL(ni_syscall)
SYSCALL_SPU(setresgid)
SYSCALL_SPU(getresgid)
COMPAT_SYS_SPU(prctl)