Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index acc7e3b7fe17..ad5897dc4495 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -986,7 +986,7 @@ int w1_process(void *data)
         return 0;
 }
 
-static int w1_init(void)
+static int __init w1_init(void)
 {
         int retval;
 
@@ -1034,7 +1034,7 @@ err_out_exit_init:
         return retval;
 }
 
-static void w1_fini(void)
+static void __exit w1_fini(void)
 {
         struct w1_master *dev;