Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 2d74fc9ae3ba..ed1c54284b8f 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -441,7 +441,7 @@ static void octeon_pci_initialize(void)
 
         /*
          * TDOMC must be set to one in PCI mode. TDOMC should be set to 4
-         * in PCI-X mode to allow four oustanding splits. Otherwise,
+         * in PCI-X mode to allow four outstanding splits. Otherwise,
          * should not change from its reset value. Don't write PCI_CFG19
          * in PCI mode (0x82000001 reset value), write it to 0x82000004
          * after PCI-X mode is known. MRBCI,MDWE,MDRE -> must be zero.
@@ -515,7 +515,7 @@ static void octeon_pci_initialize(void)
 #endif  /* USE_OCTEON_INTERNAL_ARBITER */
 
         /*
-         * Preferrably written to 1 to set MLTD. [RDSATI,TRTAE,
+         * Preferably written to 1 to set MLTD. [RDSATI,TRTAE,
          * TWTAE,TMAE,DPPMR -> must be zero. TILT -> must not be set to
          * 1..7.
          */