From 0d579ffd595731bb2ffad3ca39c2c2f0309f1cc9 Mon Sep 17 00:00:00 2001 From: Darren Hart <dvhart@linux.intel.com> Date: Sat, 22 Sep 2012 11:14:18 -0700 Subject: [PATCH] fri2: Update to emgd 1.14 Merge the emgd-1.14 branch in the fri2-standard.scc. Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- bsp/fri2/fri2-standard.scc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/fri2/fri2-standard.scc b/bsp/fri2/fri2-standard.scc index a42f1b5a0..8205135d1 100644 --- a/bsp/fri2/fri2-standard.scc +++ b/bsp/fri2/fri2-standard.scc @@ -5,7 +5,7 @@ define KARCH i386 include ktypes/standard branch fri2 -git merge emgd-1.10 +git merge emgd-1.14 include fri2.scc include cfg/efi-ext.scc -- GitLab