diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:47:43 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 03:47:43 -0500 |
| commit | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (patch) | |
| tree | 7f027e92e4578e293b20ac1f2c389600a795ea7f /fs/locks.c | |
| parent | f3c91c1deaf8493526d8216be94c33e963f00962 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
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> |