From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Tue, 10 Dec 2013 08:24:37 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0341da6019c752b42529a56763389fd46184e095;p=thirdparty%2Fgrub.git

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

0341da6019c752b42529a56763389fd46184e095
diff --cc ChangeLog
index d330978fb,3992fb977..aa4c05c3f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
+ 2013-12-09  Jon McCune <jonmccune@google.com>
+ 
+ 	* Add --no-rs-codes flag to optionally disable reed-solomon codes
+ 	in grub-install and grub-bios-setup for x86 BIOS targets.
+ 
 +2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	Add missing compile and link options for sparc64-emu.
 +
  2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	Implement sparc64 trampolines (needed for sparc64-emu).