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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [IPV4]: Restore multipath routing after rt_next changes.
  [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
  [NET]: Reorder fields of struct dst_entry
  [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
  [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
  [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
  [NET]: Introduce union in struct dst_entry to hold 'next' pointer
  [DECNET]: fix misannotation of linkinfo_dn
  [DECNET]: FRA_{DST,SRC} are le16 for decnet
  [UDP]: UDP can use sk_hash to speedup lookups
  [NET]: Fix whitespace errors.
  [NET] XFRM: Fix whitespace errors.
  [NET] X25: Fix whitespace errors.
  [NET] WANROUTER: Fix whitespace errors.
  [NET] UNIX: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] SCHED: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index f14ad6635fcc..f8bcf5d114d9 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -63,7 +63,7 @@
  *              Damn. Added missing check for ->dead in listen queues scanning.
  *
  */
- 
+
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
@@ -118,7 +118,7 @@ static struct sock *unix_get_socket(struct file *filp)
  *      Keep the number of times in flight count for the file
  *      descriptor if it is for an AF_UNIX socket.
  */
- 
+
 void unix_inflight(struct file *fp)
 {
         struct sock *s = unix_get_socket(fp);
@@ -190,7 +190,7 @@ void unix_gc(void)
                 unix_sk(s)->gc_tree = GC_ORPHAN;
         }
         /*
-         *      Everything is now marked 
+         *      Everything is now marked
          */
 
         /* Invariant to be maintained:
@@ -227,7 +227,7 @@ void unix_gc(void)
         }
 
         /*
-         *      Mark phase 
+         *      Mark phase
          */
 
         while (!empty_stack())
@@ -237,11 +237,11 @@ void unix_gc(void)
 
                 spin_lock(&x->sk_receive_queue.lock);
                 skb = skb_peek(&x->sk_receive_queue);
-                
+
                 /*
-                 *      Loop through all but first born 
+                 *      Loop through all but first born
                  */
-                
+
                 while (skb && skb != (struct sk_buff *)&x->sk_receive_queue) {
                         /*
                          *      Do we have file descriptors ?