Blame SOURCES/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch

d41074
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
a85e8e
From: Vladimir Serbinenko <phcoder@gmail.com>
a85e8e
Date: Fri, 27 Dec 2013 11:20:37 +0100
d41074
Subject: [PATCH] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
a85e8e
a85e8e
Conflicts:
a85e8e
    ChangeLog
a85e8e
---
d41074
 ChangeLog | 20 ++++++++++----------
d41074
 1 file changed, 10 insertions(+), 10 deletions(-)
a85e8e
a85e8e
diff --git a/ChangeLog b/ChangeLog
d41074
index 82dc61d24c9..da3c2dfdf0a 100644
a85e8e
--- a/ChangeLog
a85e8e
+++ b/ChangeLog
d41074
@@ -1,19 +1,19 @@
d41074
-2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
d41074
-
d41074
-	* NEWS: First draft of 2.02 entry.
d41074
-
d41074
-2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
d41074
-
d41074
-	* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
d41074
-	* docs/grub.texi (Getting the source code): Likewise.
d41074
-
d41074
-2013-12-25  Vladimir Serbinenko  <phcoder@gmail.com>
a85e8e
+2013-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
d41074
 
d41074
 	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
d41074
 
d41074
 	As these functions are used on pre-ARMv6 CPUs as well we don't want
d41074
 	to make assembler assume that architecture is higher than default one.
d41074
 
d41074
+2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
a85e8e
+
d41074
+	* NEWS: First draft of 2.02 entry.
a85e8e
+
d41074
+2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
d41074
+
d41074
+	* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
d41074
+	* docs/grub.texi (Getting the source code): Likewise.
a85e8e
+
a85e8e
 2013-12-25  Andrey Borzenkov <arvidjaar@gmail.com>
a85e8e
 
a85e8e
 	* grub-core/osdep/windows/platform.c (get_platform): Fix EFI