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

diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c
index 6374df7e77d1..0755ae028e43 100644
--- a/net/rxrpc/sysctl.c
+++ b/net/rxrpc/sysctl.c
@@ -27,7 +27,7 @@ int rxrpc_knet;
 static struct ctl_table_header *rxrpc_sysctl = NULL;
 
 static ctl_table rxrpc_sysctl_table[] = {
-        {
+        {
                 .ctl_name       = 1,
                 .procname       = "kdebug",
                 .data           = &rxrpc_kdebug,
@@ -35,7 +35,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
         },
-        {
+        {
                 .ctl_name       = 2,
                 .procname       = "ktrace",
                 .data           = &rxrpc_ktrace,
@@ -43,7 +43,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
         },
-        {
+        {
                 .ctl_name       = 3,
                 .procname       = "kproto",
                 .data           = &rxrpc_kproto,
@@ -51,7 +51,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
         },
-        {
+        {
                 .ctl_name       = 4,
                 .procname       = "knet",
                 .data           = &rxrpc_knet,
@@ -59,7 +59,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec
         },
-        {
+        {
                 .ctl_name       = 5,
                 .procname       = "peertimo",
                 .data           = &rxrpc_peer_timeout,
@@ -67,7 +67,7 @@ static ctl_table rxrpc_sysctl_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_doulongvec_minmax
         },
-        {
+        {
                 .ctl_name       = 6,
                 .procname       = "conntimo",
                 .data           = &rxrpc_conn_timeout,