Merge branch 'devel'

[~andy/linux] / net / irda / irlmp_event.c

diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index c1fb5db8104215642371b1ff664c96e4f4b62a6c..9505a7d06f1a8483a7b5658c702273df660f13b0 100644 (file)
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -498,7 +498,7 @@ static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
        switch (event) {
 #ifdef CONFIG_IRDA_ULTRA
        case LM_UDATA_INDICATION:
-               /* This is most bizzare. Those packets are  aka unreliable
+               /* This is most bizarre. Those packets are  aka unreliable
                 * connected, aka IrLPT or SOCK_DGRAM/IRDAPROTO_UNITDATA.
                 * Why do we pass them as Ultra ??? Jean II */
                irlmp_connless_data_indication(self, skb);