merge mainline into gfxmenu
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 25 Dec 2009 20:32:46 +0000 (21:32 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 25 Dec 2009 20:32:46 +0000 (21:32 +0100)
commit9f293ab0dfdc9a73a9747c99ecf2a7ae51077b19
tree7564e68e0fb3971bbc900ae522c4cd20e3bb65c7
parent3d79d70fe4d78302b6c0a116278e490193154dc6
parenta2c1332b709efa6de30c376a29b09d3052aced5e
merge mainline into gfxmenu
21 files changed:
Makefile.in
commands/minicmd.c
commands/videotest.c
conf/any-emu.rmk
conf/common.rmk
configure.ac
include/grub/misc.h
include/grub/xnu.h
kern/misc.c
loader/xnu.c
normal/cmdline.c
normal/main.c
normal/menu_text.c
util/grub-install.in
util/grub-mkconfig_lib.in
util/grub.d/00_header.in
util/grub.d/30_os-prober.in
util/sparc64/ieee1275/grub-install.in
video/efi_gop.c
video/efi_uga.c
video/i386/pc/vbe.c