Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[powerpc.git] / net / ax25 / ax25_std_timer.c

diff --git a/net/ax25/ax25_std_timer.c b/net/ax25/ax25_std_timer.c
index a29c480..e3528b1 100644 (file)
--- a/net/ax25/ax25_std_timer.c
+++ b/net/ax25/ax25_std_timer.c
@@ -34,7 +34,7 @@
 void ax25_std_heartbeat_expiry(ax25_cb *ax25)
 {
        struct sock *sk=ax25->sk;
-       
+
        if (sk)
                bh_lock_sock(sk);