summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 12:17:20 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 12:17:20 +0000
commit0e647037fed5632e7c5989ec359ab84c676888ac (patch)
treee69061b2344fd5802b2fe12590c8e1588eaee3cb /drivers/spi
parentf56be67b190a95b9e2d4d9bd30b61907cabcf443 (diff)
parent9169051617df7fca597274e9e43324332cb8f0ee (diff)
parent7d57cd8946f21db2194154af1b95238af8579f9e (diff)
downloadlinux-0e647037fed5632e7c5989ec359ab84c676888ac.tar.gz
linux-0e647037fed5632e7c5989ec359ab84c676888ac.tar.bz2
linux-0e647037fed5632e7c5989ec359ab84c676888ac.zip
Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/txx9' into spi-next