refresh

diff --git a/meta b/meta
index be13efacd23da1d455122854f323996458c8ec78..0e95bb757d1bed409f2166cea3c7fbd6c567903a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 9bddb335c19ff91c00a806501508b16c27110d43
-Head: d1019d4f18fc12b7b4dce5da5767707a2510b6e6
+Previous: d2f331f70e54fc1632c3c1852e059449b703d116
+Head: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
 Applied:
-  daemon: 904ca840f5bed231af02668b834fcfb4aef3e8dc
-  refresh-temp: d1019d4f18fc12b7b4dce5da5767707a2510b6e6
+  daemon: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
 Unapplied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   cfg: 885d7a9ffef268c770e2886b6e2a00c5717923d3

diff --git a/patches/daemon b/patches/daemon
index 25171a8558cdfa6f29593ad7fa6b6683dabcb1a0..67b8884b4f3ab7964ece30d4c53365b9f1fcadbf 100644 (file)
--- a/patches/daemon
+++ b/patches/daemon
@@ -1,5 +1,5 @@
 Bottom: 7ba4916f6ef28f711b42fb3c392b5c0f267a8104
-Top:    59fbc25a37db407224f86c22d5dd689743341176
+Top:    fe525ce7184567022966920e612b61d5545b2bc9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 12:12:45 -0700
 
@@ -13,9 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-old mode 100644
-new mode 100755
-index 7cd60a4..8b09453
+index 7cd60a4..8b09453 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -32,6 +32,7 @@

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f2e1c35..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,12 +0,0 @@
-Bottom: 59fbc25a37db407224f86c22d5dd689743341176
-Top:    fe525ce7184567022966920e612b61d5545b2bc9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:19:16 -0700
-
-Refresh of daemon
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-old mode 100755
-new mode 100644