diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /fs/locks.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index 0e62dd35d088..8729347bcd1a 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -122,7 +122,6 @@ | |||
| 122 | #include <linux/module.h> | 122 | #include <linux/module.h> |
| 123 | #include <linux/security.h> | 123 | #include <linux/security.h> |
| 124 | #include <linux/slab.h> | 124 | #include <linux/slab.h> |
| 125 | #include <linux/smp_lock.h> | ||
| 126 | #include <linux/syscalls.h> | 125 | #include <linux/syscalls.h> |
| 127 | #include <linux/time.h> | 126 | #include <linux/time.h> |
| 128 | #include <linux/rcupdate.h> | 127 | #include <linux/rcupdate.h> |