diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:06:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:06:00 -0700 |
| commit | 8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0 (patch) | |
| tree | 4f5f771f66a9b223b116742a8a04019cad287a4f /fs | |
| parent | 93416253073511716f7e70c06e32c3810c3deac4 (diff) | |
| parent | e0fb8c418520b41d57667befdb8861c46cdf69e0 (diff) | |
Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes
* 'fixes' of ssh://master.kernel.org/~sfr/next-fixes:
acpi: update gfp/slab.h includes
ocfs2: update gfp/slab.h includes
davinci: update gfp/slab.h includes
arm: update gfp/slab.h includes
v4l-dvb: update gfp/slab.h includes
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/reservations.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c index 40650021fc2..d8b6e4259b8 100644 --- a/fs/ocfs2/reservations.c +++ b/fs/ocfs2/reservations.c @@ -26,7 +26,6 @@ #include <linux/fs.h> #include <linux/types.h> -#include <linux/slab.h> #include <linux/highmem.h> #include <linux/bitops.h> #include <linux/list.h> |