diff -r 991323b177cf -r 854014f5c703 ChangeLog
--- a/ChangeLog	Tue Jul 24 18:09:12 2007 -0500
+++ b/ChangeLog	Tue Jul 24 18:11:05 2007 -0500
@@ -1,3 +1,32 @@ 2007-07-22  Robert Millan  <address@hidden
+2007-07-24  Jerone Young  <address@hidden>
+
+        * conf/i386-pc.rmk: Add Multiboot loader and multiboot 2 to multiboot
+	modules for compilation.
+	* conf/powerpc-ieee1275.rmk: Likewise.
+
+	* include/multiboot.h: Move multiboot definitions to one file. Rename
+	many definitions to not get grub specific.
+	* include/multiboot2.h: Create header with multiboot 2 definitions.
+	* include/grub/multiboot.h: Header for grub specific function
+	prototypes and definitions.
+	* include/grub/multiboot2.h: Likewise.
+	* include/grub/multiboot_loader.h: Likewise.
+	* include/grub/i386/pc/multiboot.h: Removed.
+	* include/grub/powerpc/ieee1275: Removed.
+
+	* loader/multiboot_loader.c: Created to act as a proxy for multiboot 1
+	and 2 to allow for one multiboot and module commands.
+	* loader/multiboot2.c: Add multiboot2 functionality.
+	* loader/i386/pc/multiboot.c: Modify for new multiboot header location
+	and definition names.
+	* loader/i386/pc/multiboot2.c: Created to add i386 specific multiboot
+	2 functions.
+	* loader/powerpc/ieee1275/multiboot2.c: Created to add powerpc
+	ieee1275 specific multiboot2 code.
+
+	* kern/i386/pc/startup.S: Change headers and definition names for
+	multiboot. Add function grub_multiboot2_real_boot for multiboot 2.
+
 2007-07-22  Robert Millan  <address@hidden>
 
 	* geninitheader.sh: Process file specified in first parameter rather