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/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
index c41dbe5fadee..85c58c49b4d0 100644
--- a/net/ax25/ax25_subr.c
+++ b/net/ax25/ax25_subr.c
@@ -56,7 +56,7 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr)
          */
         if (ax25->va != nr) {
                 while (skb_peek(&ax25->ack_queue) != NULL && ax25->va != nr) {
-                        skb = skb_dequeue(&ax25->ack_queue);
+                        skb = skb_dequeue(&ax25->ack_queue);
                         kfree_skb(skb);
                         ax25->va = (ax25->va + 1) % ax25->modulus;
                 }
@@ -65,7 +65,7 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr)
 
 void ax25_requeue_frames(ax25_cb *ax25)
 {
-        struct sk_buff *skb, *skb_prev = NULL;
+        struct sk_buff *skb, *skb_prev = NULL;
 
         /*
          * Requeue all the un-ack-ed frames on the output queue to be picked