Merge branch 'next/generic' into mips-for-linux-next

diff --cc arch/mips/cavium-octeon/setup.c
Simple merge

diff --cc arch/mips/include/asm/pgtable-32.h
index 469390656c3fe269539ef725c8b513fd5888d352,d169c07c38eeeb46b5fdb0c16457ceb63ec5f90d..5d56bb2303454e1ff3937d2acd0a99f97bba864f
--- 1/arch/mips/include/asm/pgtable-32.h
--- 2/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@@ -19,17 -19,12 +19,7 @@@
  #include <asm-generic/pgtable-nopmd.h>
  
  /*
-  * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
-  *    starting at the top and working down. This is for populating the
-  *    TLB before trap_init() puts the TLB miss handler in place. It
-  *    should be used only for entries matching the actual page tables,
-  *    to prevent inconsistencies.
 - * - add_wired_entry() add a fixed TLB entry, and move wired register
-- */
- extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
 -extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
--                             unsigned long entryhi, unsigned long pagemask);
- 
--
--/* Basically we have the same two-level (which is the logical three level
++ * Basically we have the same two-level (which is the logical three level
   * Linux page table layout folded) page tables as the i386.  Some day
   * when we have proper page coloring support we can have a 1% quicker
   * tlb refill handling mechanism, but for now it is a bit slower but

diff --cc arch/mips/jazz/irq.c
Simple merge

diff --cc arch/mips/kernel/smtc.c
Simple merge

diff --cc arch/mips/lantiq/irq.c
Simple merge

diff --cc arch/mips/mm/tlb-r4k.c
Simple merge

diff --cc arch/mips/sgi-ip27/ip27-irq.c
Simple merge