Merge branch 'master' of ssh://gitrw.chromium.org:9222/crosutils

bootperf-bin/showbootdata

@@ -107,10 +107,9 @@ def main(argv):
       keylist.extend(kl.split(','))
   else:
     keylist = None
+  if not args:
+    args = ["."]
   printfunc(args, use_timestats, keylist)
 
 if __name__ == "__main__":
-  if len(sys.argv) > 1:
-    main(sys.argv[1:])
-  else:
-    main(["."])
+  main(sys.argv[1:])

build_kernel_image.sh

@@ -146,7 +146,6 @@ cros_secure
 kern_guid=%U
 tpm_tis.force=1
 tpm_tis.interrupts=0
-nmi_watchdog=1
 EOF
   WORK="${WORK} ${FLAGS_working_dir}/config.txt"