Merge master.kernel.org:/home/davem/BK/misc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

fs/autofs/inode.c

@@ -61,7 +61,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid
 
 	if ( !options ) return 1;
 	while ((this_char = strsep(&options,",")) != NULL) {
-		if (!*value)
+		if (!*this_char)
 			continue;
 		if ((value = strchr(this_char,'=')) != NULL)
 			*value++ = 0;

fs/exportfs/expfs.c

@@ -34,7 +34,7 @@ struct export_operations export_op_default;
 
 #define	CALL(ops,fun) ((ops->fun)?(ops->fun):export_op_default.fun)
 
-#define dprintk(x, ...) do{}while(0)
+#define dprintk(x, a...) do{}while(0)
 
 struct dentry *
 find_exported_dentry(struct super_block *sb, void *obj, void *parent,