]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...
authorMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:17 +0000 (00:51 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:17 +0000 (00:51 +0000)
commit6e07b9179aa0f85d16b95a7d5d2a48c7a145291a
tree5b7c5fb534404ea19b2f91c661f8d6bcb1096764
parent3bcbc14911b82c245dc43dd02fbf85725b620e6c
parent8fc39b516623f3beed18be701d2acfe0e50b8d86
parent3a44623d5e1404b29786f1afd225d1aa04a4ae90
parent3d8c869796b61f2dd7c1b84112902e199936c053
parent5c5989ccd32c37890115a6dd5c03f39cba7f7beb
parentcdd1945bde1e03149899a5d65c54fc0f163d24ac
parentfb534f10755954827a4b71b9a21f9b5fa93707a9
parent14c48ab2d9be451ff51783cfb9996428b145e878
parent7984b5ca5c6245e332adcb8a8c2aefb2732b40bf
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x-psc', 'spi/topic/mpc52xx', 'spi/topic/mxs', 'spi/topic/nuc900', 'spi/topic/oc-tiny' and 'spi/topic/octeon' into spi-next
18 files changed:
drivers/spi/Kconfig
drivers/spi/spi-altera.c
drivers/spi/spi-ath79.c
drivers/spi/spi-atmel.c
drivers/spi/spi-bcm63xx.c
drivers/spi/spi-bitbang.c
drivers/spi/spi-clps711x.c
drivers/spi/spi-gpio.c
drivers/spi/spi-imx.c
drivers/spi/spi-mpc512x-psc.c
drivers/spi/spi-mpc52xx.c
drivers/spi/spi-mxs.c
drivers/spi/spi-nuc900.c
drivers/spi/spi-oc-tiny.c
drivers/spi/spi-octeon.c
drivers/spi/spi-tegra114.c
drivers/spi/spi-tegra20-sflash.c
drivers/spi/spi-tegra20-slink.c