* 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 d3e7c31c0343006568c7171e9c23a7bc1809b4ae..68ada05ec3eade1ca82e0698633e54684678146b 100644 (file)
--- 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