From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 Jan 2011 22:55:50 +0000 (+0100)
Subject: merge ia64-emu into ia64
X-Git-Tag: 2.00~1266^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7edf63fce6ba122b3aee85b20d3ecef346e6984f;p=thirdparty%2Fgrub.git

merge ia64-emu into ia64
---

7edf63fce6ba122b3aee85b20d3ecef346e6984f
diff --cc grub-core/kern/ia64.moved/trampoline.S
index e91991041,000000000..e91991041
mode 100644,000000..100644
--- a/grub-core/kern/ia64.moved/trampoline.S
+++ b/grub-core/kern/ia64.moved/trampoline.S