| commit | d947d635924379f806d43ad0e166c277ca84e3a0 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Sep 04 12:09:17 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Sep 04 12:09:17 2012 -0700 |
| tree | 353b72a25e02efe35fb026622c4d16c360a2569e | |
| parent | 61ed59ed09e6ad2b8395178ea5ad5f653bba08e3 [diff] | |
| parent | f755bbbf1f9f180aa61eb730d638b62e225bfc10 [diff] |
Merge tag 'v3.6-rc1-iio-fixes-2' of git://git.kernel.org/pub/scm/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