From 474b60f242ec470911bd8f54f895ac8f127f0385 Mon Sep 17 00:00:00 2001
From: Shan Wei <davidshan@tencent.com>
Date: Mon, 16 Jan 2012 18:34:24 +0000
Subject: [PATCH] --- yaml --- r: 286183 b: refs/heads/master c:
 2b2d465631db59c144f537a9bef47a883c55d670 h: refs/heads/master i:   286181:
 5fd30e0e624f1db94e8dbd5ee41a68223cfa01e9   286179:
 412e78bd41ca469bd448712a85d3de621003e8e6   286175:
 9ae037049bb8fd3d58fb5722513c9572b2073487 v: v3

---
 [refs]                       | 2 +-
 trunk/net/caif/caif_usb.c    | 1 -
 trunk/net/ipv4/udp_diag.c    | 1 -
 trunk/net/openvswitch/flow.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b2a72183f548..a688ac2da222 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34aa6f1400810890636ba0b170effbfa71eacec7
+refs/heads/master: 2b2d465631db59c144f537a9bef47a883c55d670
diff --git a/trunk/net/caif/caif_usb.c b/trunk/net/caif/caif_usb.c
index 5fc9eca8cd41..3d737fbcb182 100644
--- a/trunk/net/caif/caif_usb.c
+++ b/trunk/net/caif/caif_usb.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/slab.h>
-#include <linux/netdevice.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/usbnet.h>
diff --git a/trunk/net/ipv4/udp_diag.c b/trunk/net/ipv4/udp_diag.c
index e5e18cb8a586..8a949f19deb6 100644
--- a/trunk/net/ipv4/udp_diag.c
+++ b/trunk/net/ipv4/udp_diag.c
@@ -15,7 +15,6 @@
 #include <linux/udp.h>
 #include <net/udp.h>
 #include <net/udplite.h>
-#include <linux/inet_diag.h>
 #include <linux/sock_diag.h>
 
 static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,
diff --git a/trunk/net/openvswitch/flow.c b/trunk/net/openvswitch/flow.c
index fe7f020a843e..1252c3081ef1 100644
--- a/trunk/net/openvswitch/flow.c
+++ b/trunk/net/openvswitch/flow.c
@@ -32,7 +32,6 @@
 #include <linux/in.h>
 #include <linux/rcupdate.h>
 #include <linux/if_arp.h>
-#include <linux/if_ether.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/tcp.h>