diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /fs/open.c | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 1 |
1 files changed, 0 insertions, 1 deletions
| @@ -1124,7 +1124,6 @@ asmlinkage long sys_openat(int dfd, const char __user *filename, int flags, | |||
| 1124 | prevent_tail_call(ret); | 1124 | prevent_tail_call(ret); |
| 1125 | return ret; | 1125 | return ret; |
| 1126 | } | 1126 | } |
| 1127 | EXPORT_SYMBOL_GPL(sys_openat); | ||
| 1128 | 1127 | ||
| 1129 | #ifndef __alpha__ | 1128 | #ifndef __alpha__ |
| 1130 | 1129 | ||