Merge kroah.com:/home/greg/linux/BK/bleed-2.5

into kroah.com:/home/greg/linux/BK/pci-2.5

5 files changed, 5 insertions, 5 deletions

diff --git a/include/asm-mips64/mipsregs.h b/include/asm-mips64/mipsregs.h
index 7be03cffab46..ecbf30176e82 100644
--- a/include/asm-mips64/mipsregs.h
+++ b/include/asm-mips64/mipsregs.h
@@ -310,7 +310,7 @@ __BUILD_SET_CP0(config,CP0_CONFIG)
 #define CE1_SP_HINT_TO_SHARED_SC_BLOCKS	15
 
 /*
- * These flags define in which priviledge mode the counters count events
+ * These flags define in which privilege mode the counters count events
  */
 #define CEB_USER	8	/* Count events in user mode, EXL = ERL = 0 */
 #define CEB_SUPERVISOR	4	/* Count events in supvervisor mode EXL = ERL = 0 */
diff --git a/include/asm-mips64/pci.h b/include/asm-mips64/pci.h
index d18ee0cd62ba..a7cc388c5824 100644
--- a/include/asm-mips64/pci.h
+++ b/include/asm-mips64/pci.h
@@ -126,7 +126,7 @@ static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr,
  * must match what was provided for in a previous pci_map_single call.  All
  * other usages are undefined.
  *
- * After this call, reads by the cpu to the buffer are guarenteed to see
+ * After this call, reads by the cpu to the buffer are guaranteed to see
  * whatever the device wrote there.
  */
 static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h
index b32768e57d16..b47b11682135 100644
--- a/include/asm-mips64/pgtable.h
+++ b/include/asm-mips64/pgtable.h
@@ -318,7 +318,7 @@ extern inline void pte_clear(pte_t *ptep)
 }
 
 /*
- * (pmds are folded into pgds so this doesnt get actually called,
+ * (pmds are folded into pgds so this doesn't get actually called,
  * but the define is needed for a generic inline function.)
  */
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
diff --git a/include/asm-mips64/processor.h b/include/asm-mips64/processor.h
index d92f39dd714a..e9eabd0347c0 100644
--- a/include/asm-mips64/processor.h
+++ b/include/asm-mips64/processor.h
@@ -256,7 +256,7 @@ extern inline unsigned long thread_saved_pc(struct thread_struct *t)
 do {									\
 	unsigned long __status;						\
 									\
-	/* New thread looses kernel privileges. */			\
+	/* New thread loses kernel privileges. */			\
 	__status = regs->cp0_status & ~(ST0_CU0|ST0_FR|ST0_KSU);	\
 	__status |= KSU_USER;						\
 	__status |= (current->thread.mflags & MF_32BIT) ? 0 : ST0_FR;	\
diff --git a/include/asm-mips64/sn/klconfig.h b/include/asm-mips64/sn/klconfig.h
index f083950aebd7..2485f3d051b7 100644
--- a/include/asm-mips64/sn/klconfig.h
+++ b/include/asm-mips64/sn/klconfig.h
@@ -293,7 +293,7 @@ typedef struct kl_config_hdr {
  * Each BOARD consists of COMPONENTs and the BOARD structure has 
  * pointers (offsets) to its COMPONENT structure.
  * The COMPONENT structure has version info, size and speed info, revision,
- * error info and the NIC info. This structure can accomodate any
+ * error info and the NIC info. This structure can accommodate any
  * BOARD with arbitrary COMPONENT composition.
  *
  * The ERRORINFO part of each BOARD has error information