Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / net / netrom / nr_timer.c

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index ddba1c144260d4b6adfe1b288c9a68739d551b31..6cfaad952c6cdcbd36e5991355b1673f7394d211 100644 (file)
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -43,7 +43,7 @@ void nr_init_timers(struct sock *sk)
        init_timer(&nr->t1timer);
        nr->t1timer.data     = (unsigned long)sk;
        nr->t1timer.function = &nr_t1timer_expiry;
-       
+
        init_timer(&nr->t2timer);
        nr->t2timer.data     = (unsigned long)sk;
        nr->t2timer.function = &nr_t2timer_expiry;