refresh

diff --git a/meta b/meta
index 263efbf35950e4b485a7486c957aee86ef591d1f..2c55dfd8b09522ee45a2aaf4260037dbc1fa2ee6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 34d3779502b1fa7b903e5e867cb6b71d319d3a59
-Head: e39d42b5e1c5edc7f7bb655fe21c57eac39f063b
+Previous: f8839213873fafb0b070ee5ee57e8403dcc69a77
+Head: bbc172e91a4ccbed11dd0b33cb753aafdb6675f5
 Applied:
   daemon: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
   cfg: 91fd5f444591ae8691a5bcf155467d0e7c493963
-  log: a5a3ee3fd023e2542c4383336460223dfd1edee0
-  refresh-temp: e39d42b5e1c5edc7f7bb655fe21c57eac39f063b
+  log: bbc172e91a4ccbed11dd0b33cb753aafdb6675f5
 Unapplied:
   typo: 7a031966f6f1a9c54c3eb61aa65886c751a42da4
 Hidden:

diff --git a/patches/log b/patches/log
index 8fdce767e84616b59e31c4e9fadc986d7f69308d..0cd4998196c4bb40c3a00913aaa22cf85a3ae626 100644 (file)
--- a/patches/log
+++ b/patches/log
@@ -1,5 +1,5 @@
 Bottom: 3d9238d760c3f6458939674d7c9d6e3cd9ccd553
-Top:    52ee28c1f875bdbba14f57bd93c52d4be6508d35
+Top:    39bbbf5da98d41d0c4b43dabfd6ed1b5b0183435
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-28 16:35:30 -0700
 
@@ -13,9 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/acm_opts.cfg b/acm_opts.cfg
-old mode 100644
-new mode 100755
-index 95ac15a..52a362f
+index 95ac15a..52a362f 100644
 --- a/acm_opts.cfg
 +++ b/acm_opts.cfg
 @@ -15,9 +15,9 @@

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4450e95..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,12 +0,0 @@
-Bottom: 52ee28c1f875bdbba14f57bd93c52d4be6508d35
-Top:    39bbbf5da98d41d0c4b43dabfd6ed1b5b0183435
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:22:54 -0700
-
-Refresh of log
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-old mode 100755
-new mode 100644