merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Mon, 12 Jul 2010 19:13:28 +0000 (00:43 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Mon, 12 Jul 2010 19:13:28 +0000 (00:43 +0530)
commit297f0c2b6e8f693c85eef748afcd50dc3d657ad0
tree8e0b7a72eee9adf7f30f5d009684cc950a00bfde
parentd270972ab046a49798cabe73d1e9c1bacc5aad18
parente4f4eafc912a6b802731ea407cd00ab8438d8446
merge with mainline
164 files changed:
.bzrignore
Makefile.am
autogen.sh
configure.common
gentpl.py
grub-core/Makefile.kernel
grub-core/boot/i386/qemu/boot.S
grub-core/boot/mips/yeeloong/fwstart.S
grub-core/bus/cs5536.c
grub-core/bus/usb/ohci.c
grub-core/bus/usb/usbhub.c
grub-core/commands/cat.c
grub-core/commands/help.c
grub-core/commands/ls.c
grub-core/commands/minicmd.c
grub-core/commands/mips/yeeloong/lsspd.c
grub-core/commands/read.c
grub-core/commands/terminal.c
grub-core/commands/videotest.c
grub-core/conf/any-emu.rmk
grub-core/conf/common.rmk
grub-core/conf/i386-coreboot.rmk
grub-core/conf/i386-ieee1275.rmk
grub-core/conf/i386-pc.rmk
grub-core/conf/i386-qemu.rmk
grub-core/conf/i386.rmk
grub-core/conf/mips-qemu-mips.rmk
grub-core/conf/mips-yeeloong.rmk
grub-core/conf/mips.rmk
grub-core/conf/powerpc-ieee1275.rmk
grub-core/conf/sparc64-ieee1275.rmk
grub-core/conf/x86-efi.rmk
grub-core/disk/ata.c
grub-core/disk/lvm.c
grub-core/disk/scsi.c
grub-core/disk/usbms.c
grub-core/font/font.c
grub-core/fs/i386/pc/pxe.c
grub-core/fs/reiserfs.c
grub-core/gettext/gettext.c
grub-core/gfxmenu/font.c
grub-core/gfxmenu/gui_list.c
grub-core/include/grub/ata.h
grub-core/include/grub/charset.h
grub-core/include/grub/command.h
grub-core/include/grub/dl.h
grub-core/include/grub/efi/uga_draw.h
grub-core/include/grub/emu/misc.h
grub-core/include/grub/font.h
grub-core/include/grub/fs.h
grub-core/include/grub/gfxmenu_view.h
grub-core/include/grub/i386/pc/console.h
grub-core/include/grub/i386/qemu/kernel.h
grub-core/include/grub/i386/vga_common.h
grub-core/include/grub/i386/xnu.h
grub-core/include/grub/ieee1275/console.h
grub-core/include/grub/list.h
grub-core/include/grub/mips/loongson.h
grub-core/include/grub/mips/yeeloong/ec.h
grub-core/include/grub/mips/yeeloong/serial.h
grub-core/include/grub/misc.h
grub-core/include/grub/normal.h
grub-core/include/grub/parser.h
grub-core/include/grub/partition.h
grub-core/include/grub/script_sh.h
grub-core/include/grub/scsi.h
grub-core/include/grub/serial.h
grub-core/include/grub/term.h
grub-core/include/grub/terminfo.h
grub-core/include/grub/types.h
grub-core/include/grub/unicode.h
grub-core/include/grub/usbtrans.h
grub-core/include/grub/vga.h
grub-core/include/grub/video.h
grub-core/include/grub/video_fb.h
grub-core/kern/corecmd.c
grub-core/kern/dl.c
grub-core/kern/efi/efi.c
grub-core/kern/efi/init.c
grub-core/kern/efi/mm.c
grub-core/kern/emu/console.c
grub-core/kern/emu/getroot.c
grub-core/kern/emu/hostdisk.c
grub-core/kern/emu/misc.c
grub-core/kern/fs.c
grub-core/kern/i386/coreboot/init.c
grub-core/kern/i386/pc/init.c
grub-core/kern/i386/pc/startup.S
grub-core/kern/i386/qemu/init.c
grub-core/kern/i386/qemu/mmap.c
grub-core/kern/ieee1275/init.c
grub-core/kern/ieee1275/openfw.c
grub-core/kern/list.c
grub-core/kern/main.c
grub-core/kern/mips/startup.S
grub-core/kern/mips/yeeloong/init.c
grub-core/kern/misc.c
grub-core/kern/parser.c
grub-core/kern/rescue_parser.c
grub-core/kern/rescue_reader.c
grub-core/kern/sparc64/ieee1275/init.c
grub-core/kern/term.c
grub-core/lib/arg.c
grub-core/lib/crypto.c
grub-core/loader/i386/efi/linux.c
grub-core/loader/i386/ieee1275/linux.c
grub-core/loader/i386/multiboot_mbi.c
grub-core/loader/i386/pc/linux.c
grub-core/loader/i386/xnu.c
grub-core/loader/multiboot.c
grub-core/loader/multiboot_mbi2.c
grub-core/mmap/i386/pc/mmap_helper.S
grub-core/modules.def
grub-core/normal/auth.c
grub-core/normal/charset.c
grub-core/normal/cmdline.c
grub-core/normal/completion.c
grub-core/normal/main.c
grub-core/normal/menu.c
grub-core/normal/menu_entry.c
grub-core/normal/menu_text.c
grub-core/normal/misc.c
grub-core/normal/term.c
grub-core/partmap/gpt.c
grub-core/po/POTFILES
grub-core/script/function.c
grub-core/script/main.c
grub-core/script/parser.y
grub-core/term/at_keyboard.c
grub-core/term/efi/console.c
grub-core/term/gfxterm.c
grub-core/term/i386/pc/console.c
grub-core/term/i386/pc/vga_text.c
grub-core/term/i386/vga_common.c
grub-core/term/ieee1275/ofconsole.c
grub-core/term/serial.c
grub-core/term/terminfo.c
grub-core/term/tparm.c
grub-core/term/usb_keyboard.c
grub-core/tests/lib/functional_test.c
grub-core/tests/lib/test.c
grub-core/video/bochs.c
grub-core/video/cirrus.c
grub-core/video/efi_gop.c
grub-core/video/efi_uga.c
grub-core/video/emu/sdl.c
grub-core/video/fb/video_fb.c
grub-core/video/i386/pc/vbe.c
grub-core/video/i386/pc/vga.c
grub-core/video/ieee1275.c
grub-core/video/sm712.c
grub-core/video/sm712_init.c
grub-core/video/video.c
modules.def
tests/lib/unit_test.c
tests/util/grub-shell.in
util/grub-editenv.c
util/grub-mkfont.c
util/grub-mkimage.c
util/grub-mkrescue.in
util/grub-script-check.c
util/i386/pc/grub-setup.c
util/misc.c
util/sparc64/ieee1275/grub-setup.c