merge with mainline

This commit is contained in:
BVK Chaitanya committed 2010-07-13 00:43:28 +05:30
commit 297f0c2b6e
218 files changed
+35637 -4957

No files matched your search

+1 -1
View File
@@ -114,7 +114,7 @@ grub_pxe_open (const char *name, grub_disk_t disk)
return err;
if (*ptr == ':')
{
err = parse_ip (ptr + 1, &(data->server_ip), 0);
err = parse_ip (ptr + 1, &(data->gateway_ip), 0);
if (err)
return err;
}