Merge branches 'ar7-for-next', 'ath79-for-next', 'bcm63xx-for-next', 'bmips', 'cavium...

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/ar7/platform.c
Simple merge

diff --cc arch/mips/ath79/setup.c
index 1cf60e1d9dd3f0197f69c4911c95971afd7e5545,159b42f106b098185b908eae7efc85b245f8bb52,61bf3397251a7b3bb1d5b09f06084d873ace1fdb,159b42f106b098185b908eae7efc85b245f8bb52,159b42f106b098185b908eae7efc85b245f8bb52,159b42f106b098185b908eae7efc85b245f8bb52,159b42f106b098185b908eae7efc85b245f8bb52,159b42f106b098185b908eae7efc85b245f8bb52..80a7d4023d7ffbd872ce76ed62bbe8b496d7e6bc
--- 1/arch/mips/ath79/setup.c
--- 2/arch/mips/ath79/setup.c
--- 3/arch/mips/ath79/setup.c
--- 4/arch/mips/ath79/setup.c
--- 5/arch/mips/ath79/setup.c
--- 6/arch/mips/ath79/setup.c
--- 7/arch/mips/ath79/setup.c
--- 8/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@@@@@@@@ -134,9 -134,9 -146,11 -134,9 -134,9 -134,9 -134,9 -134,9 +146,11 @@@@@@@@@ static void __init ath79_detect_sys_typ
                        break;
        
                default:
 -------                panic("ath79: unknown SoC, id:0x%08x\n", id);
 +++++++                panic("ath79: unknown SoC, id:0x%08x", id);
                }
        
++ +++++        ath79_soc_rev = rev;
++ +++++
                sprintf(ath79_sys_type, "Atheros AR%s rev %u", chip, rev);
                pr_info("SoC: %s\n", ath79_sys_type);
        }

diff --cc arch/mips/include/asm/cpu.h
index 79e4a0dad0d931a3b815450e1e3957f945933711,2f7f41873f242ef9abd77002976ebced8cbdea3c,2f7f41873f242ef9abd77002976ebced8cbdea3c,2f7f41873f242ef9abd77002976ebced8cbdea3c,2f7f41873f242ef9abd77002976ebced8cbdea3c,2f7f41873f242ef9abd77002976ebced8cbdea3c,2f7f41873f242ef9abd77002976ebced8cbdea3c,a71c25b62580c31873e2a9624aa5e9420383fc6f..f9fa2a479dd0e175ae7fc839d833b15695103f04
--- 1/arch/mips/include/asm/cpu.h
--- 2/arch/mips/include/asm/cpu.h
--- 3/arch/mips/include/asm/cpu.h
--- 4/arch/mips/include/asm/cpu.h
--- 5/arch/mips/include/asm/cpu.h
--- 6/arch/mips/include/asm/cpu.h
--- 7/arch/mips/include/asm/cpu.h
--- 8/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@@@@@@@@ -169,8 -169,7 -169,7 -169,7 -169,7 -169,7 -169,7 -169,10 +169,11 @@@@@@@@@
        #define PRID_IMP_NETLOGIC_XLS412B       0x4c00
        #define PRID_IMP_NETLOGIC_XLS408B       0x4e00
        #define PRID_IMP_NETLOGIC_XLS404B       0x4f00
 +++++++#define PRID_IMP_NETLOGIC_AU13XX        0x8000
 ++++++ 
+++++++ #define PRID_IMP_NETLOGIC_XLP8XX        0x1000
+++++++ #define PRID_IMP_NETLOGIC_XLP3XX        0x1100
+       
        /*
         * Definitions for 7:0 on legacy processors
         */

diff --cc arch/mips/include/asm/module.h
Simple merge

diff --cc arch/mips/kernel/Makefile
Simple merge

diff --cc arch/mips/kernel/cpu-probe.c
Simple merge

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

diff --cc arch/mips/mm/Makefile
Simple merge

diff --cc arch/mips/pci/Makefile
Simple merge

diff --cc drivers/staging/octeon/ethernet-tx.c
Simple merge