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/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 7dbb16d36fff..40c7b93ababc 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -293,7 +293,7 @@ static int pm3393_enable_port(struct cmac *cmac, int which)
         pm3393_enable(cmac, which);
 
         /*
-         * XXX This should be done by the PHY and preferrably not at all.
+         * XXX This should be done by the PHY and preferably not at all.
          * The PHY doesn't give us link status indication on its own so have
          * the link management code query it instead.
          */