Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sg', 'spi/topic/sh...
authorMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:41 +0000 (14:45 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:41 +0000 (14:45 +0100)
commitc92ec7c7ae99a371bbc69f0258888a0328ba4838
treeccb9b500f3e3636fd5d0b1d237e901d73fd017ac
parent2ca0a9d80c3a2cd3917b768080cce7f59b9bc490
parented425dcf6afa2b206f6da7d7ec6a62501172b5c0
parent65598c13fd66c3b5eac16d5b8eacc704aa17ce40
parentfe78d0b7691c02744004b15f6979b3f106464bc4
parent89a6356676eba38e498507b5b67dcc07a714a149
parenteca2ebc7e007c9e2b8f5ecfcfc74b53fbe68e42b
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sg', 'spi/topic/sh-msiof', 'spi/topic/spidev' and 'spi/topic/stats' into spi-next
drivers/spi/spi.c
drivers/spi/spidev.c