Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / autofs / waitq.c

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