git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:12:47 +0000 (10:12 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:12:47 +0000 (10:12 +1100)
commit	29c011b9fe0721d3321575a7e72a76670b6dcc0e
tree	52655c1f95170ded4cafafb0b5973cdd8a1d58f7	tree \| snapshot
parent	07f3cbe2b1b4c48a4cdd962367f624a13b7d3626	commit \| diff
parent	382fc33b4a04e2dde89b4c69a6880e0c7d9761e2	commit \| diff

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

Linux kernel for KaRo TX COM modules

RSS Atom

arch/mips/bcm63xx/boards/board_bcm963xx.c	diff1 \|	diff2 \|	blob \| history
arch/mips/configs/nlm_xlp_defconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/octeon/octeon-model.h	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/octeon/octeon.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/octeon/octeon_mgmt.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/spi/Makefile	diff1 \|	diff2 \|	blob \| history