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

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