diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/nfs/proc.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/nfs/proc.c')
| -rw-r--r-- | fs/nfs/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index 193465210d7c..7be72d90d49d 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c | |||
| @@ -663,4 +663,5 @@ const struct nfs_rpc_ops nfs_v2_clientops = { | |||
| 663 | .commit_setup = nfs_proc_commit_setup, | 663 | .commit_setup = nfs_proc_commit_setup, |
| 664 | .lock = nfs_proc_lock, | 664 | .lock = nfs_proc_lock, |
| 665 | .lock_check_bounds = nfs_lock_check_bounds, | 665 | .lock_check_bounds = nfs_lock_check_bounds, |
| 666 | .close_context = nfs_close_context, | ||
| 666 | }; | 667 | }; |