Merge branch 'master' into tk71

[mv-sheeva.git] / include / linux / crush / mapper.h

diff --git a/fs/ceph/crush/mapper.h b/include/linux/crush/mapper.h
similarity index 100%
rename from fs/ceph/crush/mapper.h
rename to include/linux/crush/mapper.h