diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 12:19:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 12:20:01 +0200 |
| commit | 45bceffc3013bda7d2ebc7802e9b153b674e2d44 (patch) | |
| tree | 222d7dd8fd300925cbf12cdc0fba5bee2528997e /fs/fat/namei_vfat.c | |
| parent | 6f2f3cf00ee32f75ba007a46bab88a54d68a5deb (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
| download | linux-45bceffc3013bda7d2ebc7802e9b153b674e2d44.tar.gz linux-45bceffc3013bda7d2ebc7802e9b153b674e2d44.tar.bz2 linux-45bceffc3013bda7d2ebc7802e9b153b674e2d44.zip | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on an older, pre-rc1 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/fat/namei_vfat.c')
| -rw-r--r-- | fs/fat/namei_vfat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index 73471b7ecc8c..cb6e83557112 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -19,7 +19,6 @@ #include <linux/jiffies.h> #include <linux/ctype.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/namei.h> #include "fat.h" |