diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
| commit | 752a4a95e3c96a8e8d3405b16d292f13e8c7856b (patch) | |
| tree | 838e43696fdc45b83f082eef7230d79cfe699497 /fs/namespace.c | |
| parent | bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into spi/next
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 8a415c9c5e55..3dbfc072ec70 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/spinlock.h> | 14 | #include <linux/spinlock.h> |
| 15 | #include <linux/percpu.h> | 15 | #include <linux/percpu.h> |
| 16 | #include <linux/smp_lock.h> | ||
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 19 | #include <linux/acct.h> | 18 | #include <linux/acct.h> |