Merge branch 'for-next/misc'

commands/oftree.c

@@ -88,7 +88,8 @@ static int do_oftree(int argc, char *argv[])
 		if (root)
 			of_delete_node(root);
 
-		return 0;
+		if (!load)
+			return 0;
 	}
 
 	if (optind < argc)

include/notifier.h

@@ -35,4 +35,3 @@ int clock_notifier_call_chain(void);
 	};
 
 #endif /* __NOTIFIER_H */
-

lib/Makefile

@@ -9,7 +9,7 @@ obj-y			+= misc.o
 obj-$(CONFIG_PARAMETER)	+= parameter.o
 obj-y			+= xfuncs.o
 obj-y			+= getopt.o
-obj-y 			+= readkey.o
+obj-y			+= readkey.o
 obj-y			+= kfifo.o
 obj-y			+= libbb.o
 obj-y			+= libgen.o

lib/copy_file.c

@@ -84,4 +84,3 @@ out:
 
 	return ret;
 }
-

lib/kfifo.c

@@ -153,4 +153,3 @@ unsigned int kfifo_getc(struct kfifo *fifo, unsigned char *c)
 
 	return 0;
 }
-

lib/notifier.c

@@ -56,4 +56,3 @@ int clock_notifier_call_chain(void)
 {
 	return notifier_call_chain(&clock_notifier_list, 0, NULL);
 }
-

lib/process_escape_sequence.c

@@ -80,4 +80,3 @@ int process_escape_sequence(const char *source, char *dest, int destlen)
 	dest[i] = 0;
 	return 0;
 }
-

lib/show_progress.c

@@ -62,4 +62,3 @@ void init_progression_bar(int max)
 	else
 		printf("\t");
 }
-