refresh

diff --git a/meta b/meta
index 0e93fa24d89e792a3a5bc5a58ab8ca35d2b300f4..0f232311923b4ec3d19ec88e4a06e9a84092c94d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: dff8c56908604f2c8a12f1979b0a560f685ef590
-Head: aa256e3051da7c50ebf4945b6e056089b756ffe6
+Previous: 5d290b8f109638862fad68c89a77997677eb4471
+Head: 728b702a4d0b050ad14a57d2a4e8cbb6bd7b562c
 Applied:
-  ts: 43e862052519485c77819c59d9b5ce9a84b92917
-  refresh-temp: aa256e3051da7c50ebf4945b6e056089b756ffe6
+  ts: 728b702a4d0b050ad14a57d2a4e8cbb6bd7b562c
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

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