Merge remote-tracking branches 'spi/topic/img-spfi', 'spi/topic/imx', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:52 +0000 (11:16 +0800)
committerMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:52 +0000 (11:16 +0800)
commit8328509c4bdf28b83fd7104ca9da01bf3b58c7b0
treedcd63847c86b58b5a143bbf5edba384c6d79a2ea
parentd6cd09bea9e4e1048d566cb2f462a9e0270e6926
parent549858ce76e31d5e2139e5588df976ee42607a0d
parent56536a7ff59ccd5cb2d9a37dce4501a432456de0
parentfc9e0f71f2d7ea43fa3ba0bea68586d1462cb5a7
parent9caf5067b9cb92c4383909ad1748c804ce223c7d
parentf2234691d7d7c6154f6d850365cf6cf63cc6eb74
Merge remote-tracking branches 'spi/topic/img-spfi', 'spi/topic/imx', 'spi/topic/inline', 'spi/topic/meson' and 'spi/topic/mxs' into spi-next
drivers/spi/spi-imx.c
drivers/spi/spi.c
include/linux/spi/spi.h