From 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Wed, 6 May 2015 09:49:30 -0400
Subject: Unapplying patches to prevent spurious conflicts.

---
 Cryptlib/Cryptlib.diff | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Cryptlib/Cryptlib.diff')

diff --git a/Cryptlib/Cryptlib.diff b/Cryptlib/Cryptlib.diff
index a2f49d67..9663d90a 100644
--- a/Cryptlib/Cryptlib.diff
+++ b/Cryptlib/Cryptlib.diff
@@ -6,8 +6,8 @@ index 68bc25a..1abe78e 100644
    // BUG: hardcode OldSize == size! We have no any knowledge about
    // memory size of original pointer ptr.
    //
--  return ReallocatePool ((UINTN) size, (UINTN) size, ptr);
-+  return ReallocatePool (ptr, (UINTN) size, (UINTN) size);
+-  return ReallocatePool ((UINTN)size, (UINTN)size, ptr);
++	return ReallocatePool (ptr, (UINTN)size, (UINTN)size);
  }
  
  /* De-allocates or frees a memory block */
-- 
cgit v1.2.3