Merge branch 'broadcom' of git://dev.phrozen.org/mips-next into mips-for-linux-next

author Ralf Baechle <ralf@linux-mips.org>

Thu, 30 Aug 2012 20:15:34 +0000 (22:15 +0200)

committer Ralf Baechle <ralf@linux-mips.org>

Thu, 30 Aug 2012 20:15:34 +0000 (22:15 +0200)
author Ralf Baechle <ralf@linux-mips.org>
Thu, 30 Aug 2012 20:15:34 +0000 (22:15 +0200)
committer Ralf Baechle <ralf@linux-mips.org>
Thu, 30 Aug 2012 20:15:34 +0000 (22:15 +0200)
diff --cc arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
Simple merge
diff --cc arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
Simple merge
author	Ralf Baechle <ralf@linux-mips.org>
	Thu, 30 Aug 2012 20:15:34 +0000 (22:15 +0200)
committer	Ralf Baechle <ralf@linux-mips.org>
	Thu, 30 Aug 2012 20:15:34 +0000 (22:15 +0200)
		1	2
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h	patch \|	diff1 \|	diff2 \|	blob \| history