]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'spi/topic/quad' into spi-qspi
authorMark Brown <broonie@linaro.org>
Fri, 23 Aug 2013 11:00:15 +0000 (12:00 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 23 Aug 2013 11:00:15 +0000 (12:00 +0100)
1  2 
drivers/spi/spi.c
include/linux/spi/spi.h

Simple merge
Simple merge