From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 19:15:35 +0000 (+0200)
Subject: 	* util/i386/pc/grub-setup.c: Merge this ...
X-Git-Tag: 1.99~514
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1a338ca5ff2685320f06022cd1bbad547e7423;p=thirdparty%2Fgrub.git

	* util/i386/pc/grub-setup.c: Merge this ...
	* util/sparc64/ieee1275/grub-setup.c:  ... and this ...
	* util/grub-setup.c: ... into this.
	* include/grub/sparc64/ieee1275/boot.h (grub_boot_blocklist) [ASM_FILE]:
	New struct.
	* grub-core/fs/ext2.c (grub_ext2_open): Use return error value when
	possible.
---

diff --git a/ChangeLog b/ChangeLog
index d3e7c31c0..68ada05ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/i386/pc/grub-setup.c: Merge this ...
+	* util/sparc64/ieee1275/grub-setup.c:  ... and this ...
+	* util/grub-setup.c: ... into this.
+	* include/grub/sparc64/ieee1275/boot.h (grub_boot_blocklist) [ASM_FILE]:
+	New struct.
+
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/ext2.c (grub_ext2_open): Use return error value when
+	possible.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/partmap/sun.c (sun_partition_map_iterate): Don't needlesly