From: Greg Kroah-Hartman Date: Thu, 6 Mar 2014 19:33:04 +0000 (-0800) Subject: Merge tag 'iio-for-3.15c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d62994701b1e38794a6e4dfc54beb9ae98d3d822;p=deliverable%2Flinux.git Merge tag 'iio-for-3.15c' of git://git./linux/kernel/git/jic23/iio into staging-next Jonathan writes: Third IIO new drivers and cleanups series for 3.15. New driver * Xilinx XADC driver - This has been ready for a while but was awaiting a device tree ack (or as it turns out 3+ weeks). Cleanup * Drop some unreachable code from mag3110 highlighted by smatch. Fix * vf610 - introduced this cycle - put a possible negative error code into an unsigned long. Another smatch find - this one promoted by guilt that Dan was busy fixing all our messups. --- d62994701b1e38794a6e4dfc54beb9ae98d3d822