diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 01:59:58 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 01:59:58 +0400 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /fs/anon_inodes.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | linux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'fs/anon_inodes.c')
| -rw-r--r-- | fs/anon_inodes.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 2de009565d8e..e4b75d6eda83 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c @@ -12,7 +12,6 @@ #include <linux/file.h> #include <linux/poll.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/init.h> #include <linux/fs.h> #include <linux/mount.h> |