Merge branch 'fixes-for-linus' into mips-for-linux-next

2026-11-13 07:31:07 +00:00 · 2012-01-11 15:40:27 +01:00 · 2012-01-11 15:40:27 +01:00 · 5b0ec2efb7
commit 5b0ec2efb7
parent 5611cc4572 3d18c98367
26 changed files with 122 additions and 116 deletions
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
--- a/arch/mips/include/asm/tlbmisc.h
+++ b/arch/mips/include/asm/tlbmisc.h
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/lantiq/clk.c
+++ b/arch/mips/lantiq/clk.c
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
--- a/arch/mips/lantiq/xway/dma.c
+++ b/arch/mips/lantiq/xway/dma.c
--- a/arch/mips/lantiq/xway/ebu.c
+++ b/arch/mips/lantiq/xway/ebu.c
--- a/arch/mips/lantiq/xway/pmu.c
+++ b/arch/mips/lantiq/xway/pmu.c
--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
--- a/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
--- a/arch/mips/pci/msi-octeon.c
+++ b/arch/mips/pci/msi-octeon.c
--- a/arch/mips/pci/pci-alchemy.c
+++ b/arch/mips/pci/pci-alchemy.c
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c