refresh

diff --git a/meta b/meta
index f3c96c282276e00f5d44b91d4b4c7dc0c3065741..24075a571bb3aa72c4111c02b143358171fa5ff8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 2fa32c915e50ee552acbb651748b86ad8be2c03f
-Head: 5c4f5f1a239082fe2c657e5fa9d68f1f1161f10a
+Previous: 5bfef81e31b93c8fca012d7e39ba093ee5a69e5f
+Head: 68cdbebde6c70f29cd1e274feb7dbc011293466a
 Applied:
-  ts: aa26d8cb95e2060255f5639489016280b65ab2ea
-  refresh-temp: 5c4f5f1a239082fe2c657e5fa9d68f1f1161f10a
+  ts: 68cdbebde6c70f29cd1e274feb7dbc011293466a
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d4949f7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 717869fdf412bda1b1aa4c17a1c95aa9186add4e
-Top:    c13dc16049a1b3bc439e4486c1f1f7c0be30f94c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-11 17:41:21 -0800
-
-Refresh of ts
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index bfb4467..28721b2 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -225,7 +225,7 @@ static void acm_write(int level, const char *format, ...)
-       gettimeofday(&tv, NULL);
-       va_start(args, format);
-       lock_acquire(&log_lock);
--      fprintf(flog, "%u.%u: ", tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
-+      fprintf(flog, "%u.%u: ", (unsigned) tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
-       vfprintf(flog, format, args);
-       fflush(flog);
-       lock_release(&log_lock);

diff --git a/patches/ts b/patches/ts
index a4ed28f9f50b96a36214cfcd602802511d5470f5..4b60a88225c7896fb16bb43c5eed7efd0ca5dc76 100644 (file)
--- a/patches/ts
+++ b/patches/ts
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    717869fdf412bda1b1aa4c17a1c95aa9186add4e
+Top:    c13dc16049a1b3bc439e4486c1f1f7c0be30f94c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-11 16:51:45 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..bfb4467 100644
+index 820365c..28721b2 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -38,7 +38,7 @@ index 820365c..bfb4467 100644
 +      gettimeofday(&tv, NULL);
        va_start(args, format);
        lock_acquire(&log_lock);
-+      fprintf(flog, "%u.%u: ", tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
++      fprintf(flog, "%u.%u: ", (unsigned) tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
        vfprintf(flog, format, args);
        fflush(flog);
        lock_release(&log_lock);