Merge branch 'master' into tk71

[mv-sheeva.git] / net / ceph / auth_x_protocol.h

diff --git a/fs/ceph/auth_x_protocol.h b/net/ceph/auth_x_protocol.h
similarity index 100%
rename from fs/ceph/auth_x_protocol.h
rename to net/ceph/auth_x_protocol.h