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

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