summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/da9055-i2c.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 01:51:03 +0100
committerMark Brown <broonie@linaro.org>2014-03-30 01:51:03 +0100
commit9dee279b400629100dce152e40e058ae46046922 (patch)
treec3994877974b117d444d6da9b2e5d39a806f9b7c /drivers/mfd/da9055-i2c.c
parentMerge remote-tracking branches 'spi/topic/altera', 'spi/topic/atmel', 'spi/to... (diff)
parentspi: Remove explictly set bus_num and num_chipselect to default setting (diff)
parentspi: Remove duplicate code to check chip_select (diff)
parentspi: clps711x: Convert to use master->max_speed_hz (diff)
parentspi: coldfire-qspi: Simplify the code to set register bits for transfer speed (diff)
parentspi: Use reinit_completion at appropriate places (diff)
parentspi: davinci: Use of_match_ptr at appropriate place (diff)
downloadlinux-9dee279b400629100dce152e40e058ae46046922.tar.xz
linux-9dee279b400629100dce152e40e058ae46046922.zip
Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/completion' and 'spi/topic/davinci' into spi-next