From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 4 Sep 2012 19:09:17 +0000 (-0700)
Subject: Merge tag 'v3.6-rc1-iio-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc6~21^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d947d635924379f806d43ad0e166c277ca84e3a0;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge tag 'v3.6-rc1-iio-fixes-2' of git://git./linux/kernel/git/jic23/iio into staging-linus

IIO fixes for v3.6-rc1 set 2

A few simple fixes.

1)Fix up some possible divide by zero issues in various drivers.

2)Prevent a memory leak in an error path in lis3l02dq

3)Make sure the PTR_ERR call in at91_adc matches the
check for IS_ERR just above it rather than using a different
pointer.

Merges fine against v3.6rc4
---

d947d635924379f806d43ad0e166c277ca84e3a0