diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-31 16:29:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-31 16:29:31 +1100 |
| commit | 6a2358fa57437acef7d7cbb969fc5a2b04169671 (patch) | |
| tree | e6801118a86efd583d192d23a7ae01b011afe684 /fs/ceph/snap.c | |
| parent | 7d04c6cd669f99873a12aafee3dde2d281c20143 (diff) | |
| parent | de380b55f92986c1a84198149cb71b7228d15fbd (diff) | |
Merge remote branch 'slabh/slabh'
Conflicts:
drivers/char/sysrq.c
drivers/gpu/drm/radeon/r300.c
drivers/hid/hid-wacom.c
drivers/media/video/soc_camera.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
drivers/pcmcia/pcmcia_resource.c
drivers/s390/char/vmcp.c
drivers/staging/cx25821/cx25821-audio-upstream.c
fs/9p/vfs_super.c
include/linux/percpu.h
kernel/audit_watch.c
net/mac80211/scan.c
sound/soc/codecs/ad1938.c
Diffstat (limited to 'fs/ceph/snap.c')
| -rw-r--r-- | fs/ceph/snap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index df04e210a055..e6f9bc57d472 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -1,6 +1,7 @@ #include "ceph_debug.h" #include <linux/sort.h> +#include <linux/slab.h> #include "super.h" #include "decode.h" |