Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next
Showing
- Documentation/devicetree/bindings/spi/atmel-quadspi.txt 0 additions, 0 deletionsDocumentation/devicetree/bindings/spi/atmel-quadspi.txt
- drivers/mtd/spi-nor/Kconfig 0 additions, 9 deletionsdrivers/mtd/spi-nor/Kconfig
- drivers/mtd/spi-nor/Makefile 0 additions, 1 deletiondrivers/mtd/spi-nor/Makefile
- drivers/spi/Kconfig 9 additions, 0 deletionsdrivers/spi/Kconfig
- drivers/spi/Makefile 1 addition, 0 deletionsdrivers/spi/Makefile
- drivers/spi/atmel-quadspi.c 148 additions, 380 deletionsdrivers/spi/atmel-quadspi.c
- drivers/spi/spi-mem.c 247 additions, 22 deletionsdrivers/spi/spi-mem.c
- include/linux/spi/spi-mem.h 83 additions, 1 deletioninclude/linux/spi/spi-mem.h
Loading
Please register or sign in to comment