]> git.proxmox.com Git - grub2.git/commit
merge mainline into newreloc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 1 Apr 2010 20:17:26 +0000 (22:17 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 1 Apr 2010 20:17:26 +0000 (22:17 +0200)
commit8b0800f66f0d4f046cce62839c925ec5eed7e0d1
tree615808112fa442c9907ba3ebf2abd74d77352289
parentd1de6ed1dc4eb9783e3dfd2f08d0cb0c2d40b82d
parent495442ed025eb218077a5d86777894ffefe46c48
merge mainline into newreloc
24 files changed:
conf/common.rmk
conf/i386-coreboot.rmk
conf/i386-ieee1275.rmk
conf/i386-pc.rmk
conf/i386.rmk
conf/mips.rmk
conf/powerpc-ieee1275.rmk
include/grub/aout.h
include/grub/misc.h
include/grub/multiboot.h
include/grub/xnu.h
kern/i386/coreboot/init.c
kern/i386/pc/init.c
kern/i386/pc/startup.S
kern/mm.c
loader/i386/bsd.c
loader/i386/linux.c
loader/i386/multiboot.c
loader/i386/multiboot_mbi.c
loader/i386/multiboot_mbi2.c
loader/i386/xnu.c
loader/xnu.c
term/serial.c
tests/util/grub-shell.in