From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Nov 2013 09:05:54 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta1~334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d912bd3c969657ca3b2fbf4bb5dafbf210fc20c;p=thirdparty%2Fgrub.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:
	ChangeLog
---

1d912bd3c969657ca3b2fbf4bb5dafbf210fc20c
diff --cc ChangeLog
index da62f4fe7,54da6b54b..678976acd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,10 +1,26 @@@
 +2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/kern/arm/cache_armv6.S: Remove special handling for
 +	clang (not necessarry with -no-integrated-as).
 +	* include/grub/symbol.h [__arm__]: Likewise.
 +
 +2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* configure.ac: Use -no-integrated-as on arm with clang.
 +	* INSTALL: Mention ARM compilation with clang.
 +
 +2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* conf/Makefile.common (CCASFLAGS_PLATFORM) [COND_arm]: Add
 +	-mthumb-interwork.
 +
+ 2013-11-14  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* grub-core/fs/ext2.c (grub_ext2_read_block): Factor out common
+ 	code for indirect block handling.
+ 
+ 	Saves 185 bytes on compressed image.
+ 
  2013-11-13  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
  
  	Fix make clean.