diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-25 19:55:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-25 19:55:54 +1100 |
| commit | 09c6a6d386756b811f61b41202dbcbcdb9ca3ac5 (patch) | |
| tree | 9e06862541b60c45ca271aa00437df1f3160ffc0 /kernel/ptrace.c | |
| parent | 8cf4b82253032aa380838dbe7676aea021e4ed27 (diff) | |
| parent | 162308729bc6d196ae1d1b8225e407175785e931 (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
fs/afs/write.c
fs/cifs/dir.c
fs/ubifs/file.c
include/asm-generic/fcntl.h
net/socket.c
Diffstat (limited to 'kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions