Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6-omap-h63xx.git] / net / irda / discovery.c

diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index af0cea721d2acd19cfd16f83efed38b6d18826b6..80c33f408e3fc2ccee1059d6141728cda89d1a27 100644 (file)
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -202,7 +202,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
        /* Drop the spinlock before calling the higher layers, as
         * we can't guarantee they won't call us back and create a
         * deadlock. We will work on our own private data, so we
-        * don't care to be interupted. - Jean II */
+        * don't care to be interrupted. - Jean II */
        spin_unlock_irqrestore(&log->hb_spinlock, flags);
 
        if(buffer == NULL)