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

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

1bbb7967997fb41db7ac6f2278b67a772fb9ee55
diff --cc ChangeLog
index 87c4cace5,c356df282..aa39cb968
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* util/grub-mkrescue.c (main): Fix typo.
+ 
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/kern/mips/qemu_mips/init.c (grub_machine_init): Update
 +	clock frequency to 200 MHz,
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* tests/util/grub-shell.in: Increase console size to 1024x1024.
 +
  2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* Makefile.am (default_payload.elf): Add pata to loaded modules.