dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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