diff --git a/[refs] b/[refs]
index 93f39d922426..0b680166cb54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99535ac2d4d95dbcad6b8d8a04ea57a891fb533b
+refs/heads/master: 82bf7e97ac5b9fd03aea10df6910cad50d6c032d
diff --git a/trunk/arch/sparc64/Kconfig b/trunk/arch/sparc64/Kconfig
index ab733be9af08..b775ceb4cf98 100644
--- a/trunk/arch/sparc64/Kconfig
+++ b/trunk/arch/sparc64/Kconfig
@@ -179,7 +179,7 @@ config HUGETLB_PAGE_SIZE_512K
 	bool "512K"
 
 config HUGETLB_PAGE_SIZE_64K
-	depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
+	depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K
 	bool "64K"
 
 endchoice
diff --git a/trunk/net/bridge/netfilter/ebt_stp.c b/trunk/net/bridge/netfilter/ebt_stp.c
index 9d2ef4ffe276..0248c67277ee 100644
--- a/trunk/net/bridge/netfilter/ebt_stp.c
+++ b/trunk/net/bridge/netfilter/ebt_stp.c
@@ -10,6 +10,7 @@
 
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_stp.h>
+#include <linux/etherdevice.h>
 #include <linux/module.h>
 
 #define BPDU_TYPE_CONFIG 0
diff --git a/trunk/net/ipv6/netfilter/ip6t_mac.c b/trunk/net/ipv6/netfilter/ip6t_mac.c
index ae0b09291d17..c848152315bc 100644
--- a/trunk/net/ipv6/netfilter/ip6t_mac.c
+++ b/trunk/net/ipv6/netfilter/ip6t_mac.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 
 #include <linux/netfilter_ipv6/ip6t_mac.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>