merge with mainline
authorBVK Chaitanya <bvk@dbook>
Thu, 19 Aug 2010 11:24:00 +0000 (16:54 +0530)
committerBVK Chaitanya <bvk@dbook>
Thu, 19 Aug 2010 11:24:00 +0000 (16:54 +0530)
commit16c7cb32c807259d2d292d9012b8297927fbc922
tree2dc30b9e52e7de2f6822394f680ebbffe03f6fee
parent7afdce98a64663ff8f07d64c95383ee801d960e1
parent51f1f5afab3f3e581c54b78af0b91780c4f78b68
merge with mainline
50 files changed:
.bzrignore
acinclude.m4
configure.ac
grub-core/bus/usb/emu/usb.c
grub-core/bus/usb/ohci.c
grub-core/bus/usb/uhci.c
grub-core/bus/usb/usb.c
grub-core/bus/usb/usbhub.c
grub-core/bus/usb/usbtrans.c
grub-core/commands/acpi.c
grub-core/commands/usbtest.c
grub-core/disk/dmraid_nvidia.c
grub-core/disk/loopback.c
grub-core/disk/mdraid_linux.c
grub-core/disk/raid.c
grub-core/disk/scsi.c
grub-core/disk/usbms.c
grub-core/fs/nilfs2.c
grub-core/kern/emu/getroot.c
grub-core/kern/emu/misc.c
grub-core/kern/i386/qemu/init.c
grub-core/kern/misc.c
grub-core/kern/partition.c
grub-core/lib/arg.c
grub-core/lib/i386/relocator_asm.S
grub-core/loader/powerpc/ieee1275/linux.c
grub-core/modules.def
grub-core/normal/color.c
grub-core/normal/main.c
grub-core/partmap/bsdlabel.c
grub-core/script/argv.c
grub-core/script/execute.c
grub-core/script/function.c
grub-core/script/main.c
grub-core/script/parser.y
grub-core/script/script.c
grub-core/script/yylex.l
grub-core/term/efi/console.c
grub-core/video/cirrus.c
grub-core/video/sm712.c
grub-core/video/sm712_init.c
include/grub/emu/misc.h
include/grub/misc.h
modules.def
tests/util/grub-shell-tester.in
util/grub-fstest.c
util/grub-mkrescue.in
util/grub-probe.c
util/i386/pc/grub-setup.c
util/misc.c