pop

diff --git a/meta b/meta
index 2dca7b774fca0c0123fe750aee3bbd3b160d9af1..8e2ede5b9ca0f1e3170dc3c6b6951ab5b8cf06c7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: b6542135c769eccd5ef04836306dba89ede6fe53
-Head: c1a4e991a8edea7432c227258322c1480066328b
+Previous: b6b94af77b5dc167b86f2cefe44fc6ba0907a405
+Head: 04f73e0a67711e1553c583340ececebef91f8faa
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: c1a4e991a8edea7432c227258322c1480066328b
+  rel-1.0.6: 04f73e0a67711e1553c583340ececebef91f8faa
 Unapplied:
-  rel-1.0.6: 22e4425b34449aaba064c5dd2f726aff95faca73
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index 055528d756680fdda1ba599b42fcb2887d742887..44fda66aca46928db37ad1f284ba8fde37682685 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
-Bottom: 56f2c285e9a48bd5f17f10c897f8f459b10cd403
-Top:    73beb7f0952ab4ce6338ebefdfc022724147b557
+Bottom: 5845b20997dda75dd9baf21235ec37582f2e3321
+Top:    ad50eb8a4057129607366efe1c2bcca6a831ced6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 15:46:39 -0700