From: Greg Kroah-Hartman Date: Wed, 22 May 2013 22:11:31 +0000 (-0700) Subject: Merge tag 'iio-fixes-for-3.10a' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ed644baab64d5c2e6e130a4794680eb06f7da81c;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'iio-fixes-for-3.10a' of git://git./linux/kernel/git/jic23/iio into staging-linus Jonathan writes: First round of IIO fixes for the 3.10 cycle. The usual mixed bag of little fixes. 1) A fix for mxs-lradc having missed out on some global abi changes that and hence being unable to start up buffered output. 2) Clean up error handling in tsl2x7x 3) A build fix for some of the dac drivers when they have spi master support built in, but i2c support build as a module. 4) Add a missing disable after a oneshot capture to the st sensor core. 5) Exynos adc driver took a novel an incorrect route to get at its private data store. --- ed644baab64d5c2e6e130a4794680eb06f7da81c