]> git.ipfire.org Git - thirdparty/grub.git/commit
Merge mainline into newreloc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 24 Jun 2010 19:22:40 +0000 (21:22 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 24 Jun 2010 19:22:40 +0000 (21:22 +0200)
commit2a1d16154d85ce086c44029e0f6c28bf37755f07
treee510e2781e8ad8f56cddf2a1e455dd141bbaa870
parent5779bae94c0e86130c7bc0e67cdee540af68efb3
parent97f5cb8c875a39aed1de47754c711474d40e777e
Merge mainline into newreloc
14 files changed:
conf/common.rmk
conf/i386-coreboot.rmk
conf/i386-ieee1275.rmk
conf/i386-pc.rmk
conf/i386-qemu.rmk
conf/i386.rmk
conf/powerpc-ieee1275.rmk
conf/x86-efi.rmk
configure.ac
kern/i386/coreboot/init.c
kern/i386/pc/init.c
kern/i386/qemu/mmap.c
loader/i386/xnu.c
loader/multiboot_elfxx.c