Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-08 20:06:56 -07:00
parent ac7ba51c21 5879ae5fd0
commit 941742f497
140 changed files with 1112 additions and 716 deletions
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -26,6 +26,7 @@
 #include <linux/random.h>
 #include <linux/rhashtable.h>
 #include <linux/err.h>
+#include <linux/export.h>

 #define HASH_DEFAULT_SIZE	64UL
 #define HASH_MIN_SIZE		4U