]> git.proxmox.com Git - grub2.git/commit
merge mainline into mips
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 10 Jan 2010 12:34:48 +0000 (13:34 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 10 Jan 2010 12:34:48 +0000 (13:34 +0100)
commit85a2cf749fa52b9e7f2e4f2f39efc62e763211e0
tree5e4290a7332076f854b3f1738847804c831ec289
parentba2d24dc113d5c2634797860ede3de57904ee700
parentf0d0c0b726d1a947b4bd50f45e42d1052633eb11
merge mainline into mips
20 files changed:
bus/pci.c
conf/i386-coreboot.rmk
conf/i386-ieee1275.rmk
conf/i386-pc.rmk
conf/mips.rmk
configure.ac
fs/cpio.c
genmk.rb
include/grub/i386/at_keyboard.h
include/grub/i386/pci.h
kern/elf.c
kern/main.c
loader/powerpc/ieee1275/linux.c
loader/sparc64/ieee1275/linux.c
po/POTFILES
term/at_keyboard.c
term/gfxterm.c
term/serial.c
util/elf/grub-mkimage.c
util/grub-mkrawimage.c