refresh

diff --git a/meta b/meta
index cc51b7b92fce7fe87b82dee9f31762aa5e6793f0..55b83b969483379742420146ac929fd5ac6f92c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 939ed8c2b7d3979f6cc8eba75f0e2a736e913c59
-Head: 212d4b60fc73afd8cc1f0380dd0b015f8ad18a65
+Previous: 5787a60945b94e17805ea710b4a86101ff5b23dd
+Head: 885d7a9ffef268c770e2886b6e2a00c5717923d3
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 71bed462cc3d62031723ce0872b4e1de68861550
-  cfg: dd3019cb867e581e7032bfe17d60437b56b03a8b
-  refresh-temp: 212d4b60fc73afd8cc1f0380dd0b015f8ad18a65
+  cfg: 885d7a9ffef268c770e2886b6e2a00c5717923d3
 Unapplied:
   log: cbe50bfc0ec5aa61f08083722d2b3d53791195a9
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index 0a7699ecf16a2c9df29d6818e68d3e9d877cbf90..d0abf52c9fef6a71abe7f7908bc35cf8222fea09 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: 618c8524a45af7aa859abee4fa52733e6545dac9
-Top:    4c8ed082f31344149364323043339c69091f170d
+Top:    3633824ddccd48f940db0283f3cfc4ca2e0d204c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -16,9 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/linux/osd.h b/linux/osd.h
-old mode 100644
-new mode 100755
-index dc8bc1f..722e1b1
+index dc8bc1f..722e1b1 100644
 --- a/linux/osd.h
 +++ b/linux/osd.h
 @@ -39,11 +39,16 @@

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5e2c1d6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,12 +0,0 @@
-Bottom: 4c8ed082f31344149364323043339c69091f170d
-Top:    3633824ddccd48f940db0283f3cfc4ca2e0d204c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:18:32 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/linux/osd.h b/linux/osd.h
-old mode 100755
-new mode 100644