]> git.proxmox.com Git - grub2.git/commit
merge mainline into rescue-efi
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 17 May 2010 19:26:16 +0000 (21:26 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 17 May 2010 19:26:16 +0000 (21:26 +0200)
commit918405fd8c49f92fadb2075a5292a4ce301215c5
treeacdc308d0b9cd324d8f7b28ef05e04f65fe1aa26
parent54f83682d4c7e4fc519a837fdb9750f519f79a7b
parentf4fc97d02a05afa7d88153a2d156a5ea12d71b44
merge mainline into rescue-efi
14 files changed:
boot/i386/qemu/boot.S
conf/common.rmk
conf/i386-coreboot.rmk
conf/i386-pc.rmk
conf/sparc64-ieee1275.rmk
conf/x86-efi.rmk
configure.ac
kern/i386/coreboot/init.c
kern/i386/coreboot/startup.S
kern/ieee1275/cmain.c
kern/ieee1275/init.c
util/grub-mkrescue.in
util/i386/pc/grub-setup.c
util/sparc64/ieee1275/grub-setup.c