merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Tue, 8 Jun 2010 04:06:44 +0000 (09:36 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Tue, 8 Jun 2010 04:06:44 +0000 (09:36 +0530)
commitbaea17662be00beec21d81e1ae36d60d7a335a86
tree82c1cfdb9768bac23367ff2253c86a071a59cfa9
parente235a2289dcdb5181a91e78cffeb78a65880a71e
parent4003dd38df0897ab0e58b1f7e655b13892020337
merge with mainline
27 files changed:
INSTALL
grub-core/Makefile.kernel
grub-core/bus/cs5536.c
grub-core/bus/pci.c
grub-core/bus/usb/ohci.c
grub-core/bus/usb/uhci.c
grub-core/bus/usb/usb.c
grub-core/bus/usb/usbtrans.c
grub-core/commands/gptsync.c
grub-core/conf/i386.rmk
grub-core/conf/mips-yeeloong.rmk
grub-core/disk/scsi.c
grub-core/disk/usbms.c
grub-core/include/grub/cs5536.h
grub-core/include/grub/i386/pci.h
grub-core/include/grub/mips/yeeloong/pci.h
grub-core/include/grub/pci.h
grub-core/include/grub/scsicmd.h
grub-core/include/grub/smbus.h
grub-core/include/grub/usb.h
grub-core/include/grub/usbtrans.h
grub-core/kern/emu/getroot.c
grub-core/kern/emu/hostdisk.c
grub-core/modules.def
grub-core/term/usb_keyboard.c
util/grub-mkimage.c
util/grub-mkpasswd-pbkdf2.c