commit 31811c388aa29a9a94a68f19112773386daf3db9
Author: Kent Yoder <key@linux.vnet.ibm.com>
Date:   Tue Mar 26 13:41:49 2013 -0500

    test commit for ivan
    
    Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index ad7c732..b52e1be 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -563,6 +563,9 @@ int tpm_get_timeouts(struct tpm_chip *chip)
 		/* timeouts in msec rather usec */
 		scale = 1000;
 		chip->vendor.timeout_adjusted = true;
+	} else if (timeout && timeout < 20000) {
+		scale = 100;
+		chip->vendor.timeout_adjusted = true;
 	}
 	if (timeout)
 		chip->vendor.timeout_a = usecs_to_jiffies(timeout * scale);