diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /fs/ceph/buffer.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ceph/buffer.c')
| -rw-r--r-- | fs/ceph/buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/buffer.c b/fs/ceph/buffer.c index b98086c7aeba..c67535d70aa6 100644 --- a/fs/ceph/buffer.c +++ b/fs/ceph/buffer.c | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 1 | ||
| 2 | #include "ceph_debug.h" | 2 | #include "ceph_debug.h" |
| 3 | |||
| 4 | #include <linux/slab.h> | ||
| 5 | |||
| 3 | #include "buffer.h" | 6 | #include "buffer.h" |
| 4 | #include "decode.h" | 7 | #include "decode.h" |
| 5 | 8 | ||