Merge branch 'master' of /home/wd/git/u-boot/master/

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 8a81237..634d036 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c

@@ -653,7 +653,7 @@
 	}
 
 	if (strcmp(cmd, "unlock") == 0) {
-		if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0)
+		if (arg_off_size(argc - 2, argv + 2, &dev, &off, &size) < 0)
 			return 1;
 
 		if (!nand_unlock(&nand_info[dev], off, size)) {