]> git.proxmox.com Git - grub2.git/commitdiff
merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Thu, 10 Jun 2010 16:17:25 +0000 (21:47 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Thu, 10 Jun 2010 16:17:25 +0000 (21:47 +0530)
1  2 
commands/setpci.c
term/gfxterm.c
util/grub-script-check.c

Simple merge
diff --cc term/gfxterm.c
Simple merge
Simple merge