]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:35:03 +0000 (10:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:35:03 +0000 (10:35 +1100)
commitc5ceeeb8f07f87874b5362f66861958fb85120e1
tree5a602af8fd25a1cc7b320d094332ebf3b5b1cf56
parent0757ab5713933f84938c8bd7a30782f074512e58
parent382fc33b4a04e2dde89b4c69a6880e0c7d9761e2
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
arch/mips/include/asm/octeon/octeon-model.h
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/pinctrl/Makefile
arch/mips/bcm63xx/boards/board_bcm963xx.c
arch/mips/configs/nlm_xlp_defconfig
arch/mips/include/asm/octeon/octeon-model.h
arch/mips/include/asm/octeon/octeon.h
arch/mips/kernel/Makefile
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile