From ac95c6068056617c16ae940855bd48803e4aa651 Mon Sep 17 00:00:00 2001

From: Vladimir Serbinenko <phcoder@gmail.com>

Date: Fri, 27 Dec 2013 11:20:37 +0100

Subject: [PATCH 005/260] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:

    ChangeLog

---

 ChangeLog | 14 +++++++-------

 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog

index 82dc61d24..da3c2dfdf 100644

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2013-12-27  Vladimir Serbinenko  <phcoder@gmail.com>

+

+	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.

+

+	As these functions are used on pre-ARMv6 CPUs as well we don't want

+	to make assembler assume that architecture is higher than default one.

+

 2013-12-27  Colin Watson  <cjwatson@ubuntu.com>

 	* NEWS: First draft of 2.02 entry.

@@ -7,13 +14,6 @@

 	* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.

 	* docs/grub.texi (Getting the source code): Likewise.

-2013-12-25  Vladimir Serbinenko  <phcoder@gmail.com>

-

-	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.

-

-	As these functions are used on pre-ARMv6 CPUs as well we don't want

-	to make assembler assume that architecture is higher than default one.

-

 2013-12-25  Andrey Borzenkov <arvidjaar@gmail.com>

 	* grub-core/osdep/windows/platform.c (get_platform): Fix EFI

-- 

2.13.0