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, 8 insertions, 8 deletions

diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 19308fece3ad..dcfe6c739471 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -142,18 +142,18 @@ out:
 }
 
 static char *llc_conn_state_names[] = {
-        [LLC_CONN_STATE_ADM] =        "adm", 
-        [LLC_CONN_STATE_SETUP] =      "setup", 
+        [LLC_CONN_STATE_ADM] =        "adm",
+        [LLC_CONN_STATE_SETUP] =      "setup",
         [LLC_CONN_STATE_NORMAL] =     "normal",
-        [LLC_CONN_STATE_BUSY] =       "busy", 
-        [LLC_CONN_STATE_REJ] =        "rej", 
-        [LLC_CONN_STATE_AWAIT] =      "await", 
+        [LLC_CONN_STATE_BUSY] =       "busy",
+        [LLC_CONN_STATE_REJ] =        "rej",
+        [LLC_CONN_STATE_AWAIT] =      "await",
         [LLC_CONN_STATE_AWAIT_BUSY] = "await_busy",
         [LLC_CONN_STATE_AWAIT_REJ] =  "await_rej",
         [LLC_CONN_STATE_D_CONN] =     "d_conn",
-        [LLC_CONN_STATE_RESET] =      "reset", 
-        [LLC_CONN_STATE_ERROR] =      "error", 
-        [LLC_CONN_STATE_TEMP] =       "temp", 
+        [LLC_CONN_STATE_RESET] =      "reset",
+        [LLC_CONN_STATE_ERROR] =      "error",
+        [LLC_CONN_STATE_TEMP] =       "temp",
 };
 
 static int llc_seq_core_show(struct seq_file *seq, void *v)