pop

diff --git a/meta b/meta
index 98175c7d99d2ee1c6d995a21b24ecad5db89db4c..6679d6d673c2b22ac5137449ce6390a39dcfc961 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: c803c9ed7437920bbb84cc6346f3cc8ea49496e4
-Head: 4241a1ee0838579443846233ba67f9f6464db855
+Previous: a16cf5c8e8a235b5907f5189ff3d9d3ffe2bd763
+Head: d234c9d83479e496fa925c7f46b806d07a35d3d4
 Applied:
   acm_snoop: 4241a1ee0838579443846233ba67f9f6464db855
+  log_lid: 9bc99c564c67392596986084c29697a4fb55d006
+  logging: 39170d53e725bd8dc493d1eea532c63fde504e61
+  dest_string: d234c9d83479e496fa925c7f46b806d07a35d3d4
 Unapplied:
-  log_lid: 6ac592a74d5289b4800c84ef8c20e8ff3f2f263e
-  logging: 4ca254f3d8fda6ae709f0c38461f75b9677fa5df
-  dest_string: 3ecca436895c8c9116916121939321a15261f573
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/dest_string b/patches/dest_string
index 260a2985bc2a43ec8841c5fea1e60c022357021c..4eabd343a8698161697a984554cbb90b8f330d80 100644 (file)
--- a/patches/dest_string
+++ b/patches/dest_string
@@ -1,5 +1,5 @@
-Bottom: 9962a940efd219c52418715f8e1c4d496699b292
-Top:    48ae6ff2a380848c5f40322be0215170a36b49bf
+Bottom: b8d3f4e6e728e572ac955117432908787521d3e7
+Top:    586b39cacd2b705239045da946e474cb11840ae8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:42:59 -0800
 
@@ -28,7 +28,7 @@ index 28c3647..33ea842 100644
  {\r
        pthread_t thread;\r
 diff --git a/src/acm.c b/src/acm.c
-index daa0985..e27aa25 100644
+index ba6644f..77194ff 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -75,6 +75,7 @@ enum acm_route_prot

diff --git a/patches/log_lid b/patches/log_lid
index bb2f3a5e2a1a2173ffbf5df5ac7a1f47f365f805..228183f7851b115075b75e843680b1e775a42f65 100644 (file)
--- a/patches/log_lid
+++ b/patches/log_lid
@@ -1,5 +1,5 @@
-Bottom: 6cb4f6d1969e3d74eccfef634bcc43eed7b2a746
-Top:    a9f2547719cd51bede8c11e59c05218503096632
+Bottom: 948e405887f06ec7efba8d92fe151c75557ed455
+Top:    153c0b75aa3160318662eb6a3073828158ada012
 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 0db57eb..692e881 100644
+index 932297d..732f0e5 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

diff --git a/patches/logging b/patches/logging
index 7b2d0b641a9b2db1075a11b3d5d08f5bb9591d3e..7229406b60a9bd5d2f54a45e5158919463061863 100644 (file)
--- a/patches/logging
+++ b/patches/logging
@@ -1,5 +1,5 @@
-Bottom: a9f2547719cd51bede8c11e59c05218503096632
-Top:    9962a940efd219c52418715f8e1c4d496699b292
+Bottom: 153c0b75aa3160318662eb6a3073828158ada012
+Top:    b8d3f4e6e728e572ac955117432908787521d3e7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:08:15 -0800
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 692e881..daa0985 100644
+index 732f0e5..ba6644f 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@