]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'spi/topic/dspi' into spi-next
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)
1  2 
drivers/spi/Kconfig
drivers/spi/Makefile

Simple merge
Simple merge