Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 4c32a43b7914..2c841134f61c 100644
--- a/drivers/telephony/ixj.h
+++ b/drivers/telephony/ixj.h
@@ -1149,7 +1149,7 @@ typedef struct {
         unsigned int firstring:1; /* First ring cadence is complete */
         unsigned int pstncheck:1;       /* Currently checking the PSTN Line */
         unsigned int pstn_rmr:1;
-        unsigned int x:3;       /* unsed bits */
+        unsigned int x:3;       /* unused bits */
 
 } IXJ_FLAGS;