summaryrefslogtreecommitdiffstats
path: root/drivers/vhost/vhost.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-31 15:45:41 +0200
committerMark Brown <broonie@kernel.org>2015-08-31 15:45:41 +0200
commitc92ec7c7ae99a371bbc69f0258888a0328ba4838 (patch)
treeccb9b500f3e3636fd5d0b1d237e901d73fd017ac /drivers/vhost/vhost.c
parentMerge remote-tracking branches 'spi/topic/mtk', 'spi/topic/pxa2xx', 'spi/topi... (diff)
parentspi: s3c64xx: print fifo size on probe. (diff)
parentspi: Fix per-page mapping of unaligned vmalloc-ed buffer (diff)
parentspi: sh-msiof: Fix FIFO size to 64 word from 256 word (diff)
parentspi: spidev: fix inconsistent indenting (diff)
parentspi: expose spi_master and spi_device statistics via sysfs (diff)
downloadlinux-c92ec7c7ae99a371bbc69f0258888a0328ba4838.tar.xz
linux-c92ec7c7ae99a371bbc69f0258888a0328ba4838.zip
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sg', 'spi/topic/sh-msiof', 'spi/topic/spidev' and 'spi/topic/stats' into spi-next