pop

diff --git a/meta b/meta
index 74de52a2fd7d86b33c009a1dedb6dbcf98b06c5d..9b43a9a63b59a87ef188d9c9b6b9316fc77519d0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 81bf46c621cfcb706df3f341b7166d2bedadeeea
-Head: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
+Previous: 80019ddcdbb796c141db6b25109e5cf1525ecd63
+Head: b69e982755c03636396faab8b31f5359e5a67a6b
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
+  logging2: b69e982755c03636396faab8b31f5359e5a67a6b
 Unapplied:
   acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
-  logging2: b2815aaa29317cb3a18172e5692a6b1ad3361478
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging2 b/patches/logging2
index 401499f0d3b8499a08ffe19c950c7af6ba18fae0..a62b272bfbb2671eba72dfa39af2e8edd79a9755 100644 (file)
--- a/patches/logging2
+++ b/patches/logging2
@@ -1,5 +1,5 @@
-Bottom: 0f063c91893feaff89b12fc524a41fee5462240a
-Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
+Bottom: d1d96503c5833062d50818f5ab44f42d2432089a
+Top:    18456ee741149c35b5859c6627ad1b4824322404
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 12:37:47 -0800
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 41eb64e..51836a8 100644
+index f5eec84..27a6a25 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -908,7 +908,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status)