From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 25 Oct 2013 17:48:24 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta1~585
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd0179abbfcddbda966c2ede0f36401f43b6e48;p=thirdparty%2Fgrub.git

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

edd0179abbfcddbda966c2ede0f36401f43b6e48
diff --cc ChangeLog
index 6fd1989b9,f20550183..3aa8197da
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2013-10-25  Jon McCune <jonmccune@google.com>
+ 
+ 	* docs/grub.texi: Cleanup security documentation around signatures.
+ 
 +2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/fs/ext2.c (EXT2_BLOCK_SIZE): Make unsigned.
 +
 +2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/commands/gptsync.c (lba_to_chs): Use proper types rather
 +	than int.
 +
  2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* conf/Makefile.common (CPPFLAGS_KERNEL): Add -DGRUB_KERNEL=1.