summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/s5k5baf.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 01:50:57 +0100
committerMark Brown <broonie@linaro.org>2014-03-30 01:50:57 +0100
commit0f38af451fc494378110d702058acf59d24b5331 (patch)
tree5f061ea6cf7b3f31c002d1aa38fb782881620671 /drivers/media/i2c/s5k5baf.c
parentMerge remote-tracking branch 'spi/topic/dma' into spi-next (diff)
parentspi: altera: Remove the code to get unused platform_data (diff)
parentspi: atmel: fix printk format warnings (diff)
parentspi: au1550: Convert to let spi core handle checking transfer speed (diff)
parentspi: bcm63xx: Remove unused define for PFX (diff)
parentspi: bcm63xx-hsspi: Use SIMPLE_DEV_PM_OPS macro (diff)
parentspi: bfin5xx: Remove unused last_transfer pointer in bfin_spi_giveback() (diff)
parentspi: bitbang: Make spi_bitbang_stop() return void (diff)
parentspi: Use SPI_BPW_MASK macro at appropriate places (diff)
downloadlinux-0f38af451fc494378110d702058acf59d24b5331.tar.xz
linux-0f38af451fc494378110d702058acf59d24b5331.zip
Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/atmel', 'spi/topic/au1550', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bfin5xx', 'spi/topic/bitbang' and 'spi/topic/bpw' into spi-next