Merge branch 'for-next/mips'
Conflicts:
	arch/mips/boards/loongson-ls1b/serial.c
commit 8fb1d4e0758fbeb91dd82541f7c769e2d1e6900a
2 parents 4626972 + b7cc37e
@Sascha Hauer Sascha Hauer authored on 5 May 2014
Showing 13 changed files
View
arch/mips/boards/loongson-ls1b/Makefile
View
arch/mips/boards/loongson-ls1b/ram.c 100644 → 0
View
arch/mips/boards/loongson-ls1b/serial.c
View
arch/mips/configs/loongson-ls1b_defconfig
View
arch/mips/configs/tplink-mr3020_defconfig
View
arch/mips/dts/ar9331.dtsi
View
arch/mips/dts/loongson-ls1b.dts 0 → 100644
View
arch/mips/dts/ls1b.dtsi 0 → 100644
View
arch/mips/dts/tplink-mr3020.dts
View
drivers/spi/Kconfig
View
drivers/spi/Makefile
View
drivers/spi/ath79_spi.c 0 → 100644
View
drivers/spi/spi-bitbang-txrx.h 0 → 100644