]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge from trunk
authorRobert Millan <rmh@aybabtu.com>
Fri, 11 Dec 2009 21:20:00 +0000 (21:20 +0000)
committerRobert Millan <rmh@aybabtu.com>
Fri, 11 Dec 2009 21:20:00 +0000 (21:20 +0000)
1  2 
conf/i386-efi.rmk
conf/i386-pc.rmk
conf/x86_64-efi.rmk
kern/i386/realmode.S

Simple merge
Simple merge
Simple merge
Simple merge