diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
| commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb (patch) | |
| tree | addbc37a278a126a19e03edd8270e577c75a8829 /fs/open.c | |
| parent | 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 (diff) | |
| parent | e2a7f77a7b4ab298a38c8d1f624628456069bdb0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
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 | ||