Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 2 insertions, 2 deletions

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 18e81a8ffb01..fa1b4fe7a5fd 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -335,7 +335,7 @@ static void gred_reset(struct Qdisc* sch)
 
         qdisc_reset_queue(sch);
 
-        for (i = 0; i < t->DPs; i++) {
+        for (i = 0; i < t->DPs; i++) {
                 struct gred_sched_data *q = t->tab[i];
 
                 if (!q)
@@ -393,7 +393,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct rtattr *dps)
                                "shadowed VQ 0x%x\n", i);
                         gred_destroy_vq(table->tab[i]);
                         table->tab[i] = NULL;
-                }
+                }
         }
 
         return 0;