From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Apr 2012 18:30:45 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.5-rc1~109^2~526
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=06eb4eafbdc0796d741d139a44f1253278da8611;p=~emulex%2Finfiniband.git

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

06eb4eafbdc0796d741d139a44f1253278da8611
diff --cc net/core/skbuff.c
index b2595adb605,baf8d281152..a396a692623
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -66,9 -66,9 +66,8 @@@
  #include <net/xfrm.h>
  
  #include <asm/uaccess.h>
- #include <asm/system.h>
  #include <trace/events/skb.h>
 -
 -#include "kmap_skb.h"
 +#include <linux/highmem.h>
  
  static struct kmem_cache *skbuff_head_cache __read_mostly;
  static struct kmem_cache *skbuff_fclone_cache __read_mostly;