Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Fri, 5 Oct 2012 13:56:28 +0000 (15:56 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 5 Oct 2012 13:56:28 +0000 (15:56 +0200)
commit382fc33b4a04e2dde89b4c69a6880e0c7d9761e2
tree9d13ef333c4e841756c45bf29600ceac28e3f85e
parent97541ccfb9db2bb9cd1dde6344d5834438d14bda
parent986936d7c2f83427bb3bf1e629eba4373438e151
Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
arch/mips/Kconfig
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
arch/mips/lantiq/xway/sysctrl.c