Merge remote branch 'gregkh/master'

diff --cc bti.c
index 2c2f4bee5f490688418e4962e4398452d8971bd1,1f1279e11f0a975849db8123b336d0a9f4cb5a77..41d2d9bd5ac2b7bd992cb8b87f8ba61658b7f2fa
--- 1/bti.c
--- 2/bti.c
+++ b/bti.c
@@@ -671,9 -669,11 +672,11 @@@ static void read_password(char *buf, si
        tp.c_lflag &= (~ECHO);
        tcsetattr(0, TCSANOW, &tp);
  
 -      fprintf(stdout, "Enter twitter password: ");
 +      fprintf(stdout, "Enter password: ");
        fflush(stdout);
-       scanf("%79s", pwd);
+       tcflow(0, TCOOFF);
+       retval = scanf("%79s", pwd);
+       tcflow(0, TCOON);
        fprintf(stdout, "\n");
  
        tcsetattr(0, TCSANOW, &old);