refresh

diff --git a/meta b/meta
index d4c7055d3caf15045abe26d139f643a3f63eba44..903ff907d160c0955fdf9921b2f850fa6b416783 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: ed26a073b4ee5541cc5989bce2dfd963f1c32fbb
-Head: f66435b30915e9a01c63abe8d60c3bb031e197b6
+Previous: 499b48b9576582861d2c5c7a633aadb5bd2d525b
+Head: aa26d8cb95e2060255f5639489016280b65ab2ea
 Applied:
-  ts: 728b702a4d0b050ad14a57d2a4e8cbb6bd7b562c
-  refresh-temp: f66435b30915e9a01c63abe8d60c3bb031e197b6
+  ts: aa26d8cb95e2060255f5639489016280b65ab2ea
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5b6b3b2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 8dba9a8c66122ad83ec57a4ab053e5681fee86bd
-Top:    717869fdf412bda1b1aa4c17a1c95aa9186add4e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-11 17:36:25 -0800
-
-Refresh of ts
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 08b4928..bfb4467 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);
--      vfprintf(flog, "%u.%u: " tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
-+      fprintf(flog, "%u.%u: ", 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 780497a46f49995c6a8cdc4fdda4e746efbd77e1..a4ed28f9f50b96a36214cfcd602802511d5470f5 100644 (file)
--- a/patches/ts
+++ b/patches/ts
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    8dba9a8c66122ad83ec57a4ab053e5681fee86bd
+Top:    717869fdf412bda1b1aa4c17a1c95aa9186add4e
 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..08b4928 100644
+index 820365c..bfb4467 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -38,7 +38,7 @@ index 820365c..08b4928 100644
 +      gettimeofday(&tv, NULL);
        va_start(args, format);
        lock_acquire(&log_lock);
-+      vfprintf(flog, "%u.%u: " tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
++      fprintf(flog, "%u.%u: ", tv.tv_sec, (unsigned) (tv.tv_usec / 1000));
        vfprintf(flog, format, args);
        fflush(flog);
        lock_release(&log_lock);