pop

diff --git a/meta b/meta
index 7f36cd739c1f27436449a05cb593952b1d1866ac..0f27d44f04a576141f0dcc193e33b57a877504de 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 851c2a9c506e7c192e6fdf0e25d176be8e7931f5
-Head: b3d1911f70cd1b1dc39ff10e2a54fbf85f00370f
+Previous: 0fe769a1c18ad436c481e9f14fc0a8a1d780cd0b
+Head: 7edfbc2207ea0ac16db75b6f21018e3f475feb67
 Applied:
+  log_lid: 7edfbc2207ea0ac16db75b6f21018e3f475feb67
 Unapplied:
   acm_snoop: 4241a1ee0838579443846233ba67f9f6464db855
-  log_lid: 9bc99c564c67392596986084c29697a4fb55d006
   logging: 39170d53e725bd8dc493d1eea532c63fde504e61
   dest_string: d911218a21a71d4efbdc2be76b1aa7c54aaecd4e
   loop: d1f7415495cfd5f46bd76214a4332706672b458a

diff --git a/patches/log_lid b/patches/log_lid
index 228183f7851b115075b75e843680b1e775a42f65..dfa9f7a21a2f974c7903c26fce86fd8146daddf1 100644 (file)
--- a/patches/log_lid
+++ b/patches/log_lid
@@ -1,5 +1,5 @@
-Bottom: 948e405887f06ec7efba8d92fe151c75557ed455
-Top:    153c0b75aa3160318662eb6a3073828158ada012
+Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
+Top:    ed807f7ce26b873b4c494f6c82a8dfa81761fe1c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:05: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 932297d..732f0e5 100644
+index 820365c..748ef58 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -247,6 +247,7 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t