diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /fs/exofs/super.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/exofs/super.c')
| -rw-r--r-- | fs/exofs/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 32cfd61def5f..047e92fa3af8 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 31 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/smp_lock.h> | ||
| 35 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 36 | #include <linux/parser.h> | 35 | #include <linux/parser.h> |
| 37 | #include <linux/vfs.h> | 36 | #include <linux/vfs.h> |