Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / autofs / root.c

diff --git a/fs/autofs/root.c b/drivers/staging/autofs/root.c
similarity index 99%
rename from fs/autofs/root.c
rename to drivers/staging/autofs/root.c
index 0c4ca81aeaebb43e5d34b53626d1b886507cff86..0fdec4befd8400075ef8cb94a03fede184c0c5cb 100644 (file)
--- a/fs/autofs/root.c
+++ b/drivers/staging/autofs/root.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/root.c
+ * drivers/staging/autofs/root.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *