Merge branch 'master' into csb1725

[mv-sheeva.git] / net / ceph / armor.c

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