Merge tag 'iio-fixes-for-3.12c' of git://git.kernel.org/pub/scm/linux/kernel/git...
commite13cef8ded69e469b56e150e30619693b91b1864
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2013 16:40:52 +0000 (17 09:40 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2013 16:40:52 +0000 (17 09:40 -0700)
tree6848fd484b7d0e42c235ac54290f72dfde45d9ad
parentb762799dd8b03ec0aafc54ba165564902eac3e18
parente086ed76671252d5b539854a83f8506be7bea05c
Merge tag 'iio-fixes-for-3.12c' of git://git./linux/kernel/git/jic23/iio into char-misc-linus

Jonathan writes:

Third set of IIO fixes for the 3.12 cycle.

Two little ones this time:

1) A missing clk_unprepare in adf4350.
2) A missing free of the active_scan_mask when iio_disable_all_buffers is
called during an unexpected device removal.  This leak was introduced by
the fix
a87c82e454f184a9473f8cdfd4d304205f585f65 iio: Stop sampling when the device is removed
and hence is a regression fix.