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

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

Conflicts:
	ChangeLog
---

fadddc260a1c88855f7044fb2c7c99fd02c934de
diff --cc ChangeLog
index 179bc3c03,7a1026499..ba50cfb68
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,9 +1,27 @@@
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/genmod.sh.in: Strip before converting to ELF as strip
 +	may not work with ELF.
 +
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	Use unix functions for temporary files and special files on cygwin.
 +
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	Define functions explicitly rather than using --defsym in tests
 +	whenever possible. Respect locality in remaining cases.
 +
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/genmoddep.awk: Remove explicit getline < /dev/stdin.
 +
+ 2013-12-15  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+ 	* grub-core/osdep/windows/platform.c (grub_install_register_efi): Handle
+ 	unlikely errors when getting EFI variables and make exhaustive search
+ 	for all BootNNNN variables to find matching one.
+ 
  2013-12-15  Ian Campbell  <ijc@hellion.org.uk>
  
  	* grub-core/kern/uboot/init.c: Fix units of uboot timer.