refresh

diff --git a/meta b/meta
index 7a8654d175b610321c685902144f0d4054d18121..9cc19bea57bebf5a39ab7ee683cdd6b04382b6ea 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 2072c17a3f20f2ce8f119835114ad344ac61611f
-Head: 3b1fb5707a59e39e913d9e49ef298dbd2b435103
+Previous: 222a90b530c8e8afcb22d329aa961bf8b898b1b3
+Head: 91b1fc555899408595f2be440a3295ed5594e93c
 Applied:
-  atomic: 0b477b15ac308e22db226f41776eb394deb63b15
-  refresh-temp: 3b1fb5707a59e39e913d9e49ef298dbd2b435103
+  atomic: 91b1fc555899408595f2be440a3295ed5594e93c
 Unapplied:
 Hidden:

diff --git a/patches/atomic b/patches/atomic
index a3df170b846be4670db5e35e15afa34bd650f5bb..be781c029f55bb047447fda11a78ef80e114adc8 100644 (file)
--- a/patches/atomic
+++ b/patches/atomic
@@ -1,5 +1,5 @@
 Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    58672dbab4886462dc5ca2664ef7b5725ca5a6d8
+Top:    1a872937b30cacadadaea61c2b4755a657134ac8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-25 10:26:22 -0700
 
@@ -18,9 +18,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/configure.in b/configure.in
-old mode 100644
-new mode 100755
-index 997c775..dfddeac
+index 997c775..dfddeac 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -39,6 +39,16 @@ AC_CHECK_HEADER(infiniband/umad.h, [],

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c2c7b45..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,12 +0,0 @@
-Bottom: 58672dbab4886462dc5ca2664ef7b5725ca5a6d8
-Top:    1a872937b30cacadadaea61c2b4755a657134ac8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-26 10:03:21 -0700
-
-Refresh of atomic
-
----
-
-diff --git a/configure.in b/configure.in
-old mode 100755
-new mode 100644