Merge branch 'master' into next

author Vladimir Serbinenko <phcoder@gmail.com>

Fri, 27 Feb 2015 00:05:08 +0000 (01:05 +0100)

committer Vladimir Serbinenko <phcoder@gmail.com>

Fri, 27 Feb 2015 00:05:08 +0000 (01:05 +0100)
author Vladimir Serbinenko <phcoder@gmail.com>
Fri, 27 Feb 2015 00:05:08 +0000 (01:05 +0100)
committer Vladimir Serbinenko <phcoder@gmail.com>
Fri, 27 Feb 2015 00:05:08 +0000 (01:05 +0100)
diff --cc grub-core/net/arp.c
Simple merge
diff --cc grub-core/net/ip.c
Simple merge
diff --cc include/grub/net.h

index cce3edae7b2a2cfeebfaae439d846933c7862d67,538baa33ecacd7c1a34e7dd46742feaf3d9a3ea2..58d24f7c6f279a0984fdbdbaeb76ae2f6dbc9ad3
--- 1/include/grub/net.h
--- 2/include/grub/net.h
+++ b/include/grub/net.h
@@@ -537,7 -536,6 +537,8 @@@ extern char *grub_net_default_server
   
   #define GRUB_NET_TRIES 40
   #define GRUB_NET_INTERVAL 400
+ #define GRUB_NET_INTERVAL_ADDITION 20
   
+ +#define VLANTAG_IDENTIFIER 0x8100
+ +
   #endif /* ! GRUB_NET_HEADER */
diff --cc include/grub/net/ip.h
Simple merge
author	Vladimir Serbinenko <phcoder@gmail.com>
	Fri, 27 Feb 2015 00:05:08 +0000 (01:05 +0100)
committer	Vladimir Serbinenko <phcoder@gmail.com>
	Fri, 27 Feb 2015 00:05:08 +0000 (01:05 +0100)
		1	2
grub-core/net/arp.c	patch \|	diff1 \|	diff2 \|	blob \| history
grub-core/net/ip.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/net.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/net/ip.h	patch \|	diff1 \|	diff2 \|	blob \| history