diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-02 20:27:30 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-02 20:27:30 +0400 |
| commit | 1180c883d868f8ac04fff2a21889e9b2c138a4d3 (patch) | |
| tree | 87d970715a29139511519d140b7e35f1ac630d9a /include/linux/timer.h | |
| parent | abcdc99f7cb387fdc1d18fb0bc5f50b75a0f2d71 (diff) | |
| parent | 1e45cf3c493cb76618558201a8ef6f3a065f9073 (diff) | |
| download | linux-1180c883d868f8ac04fff2a21889e9b2c138a4d3.tar.xz | |
Merge tag 'iio-for-3.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Second round of new IIO drivers and cleanups for the 3.8 cycle.
Usual mixed bag of cleanups and minor improvements including
one reversion for a patch in the previous series.
* adt7310 and adt7410 drivers merged into one.
* Revert use devm_kcalloc in at91_adc (because it doesn't exist)
* unlocking fix for error path in the ad5449
* isl29018 suspend and resume support.
* improved pseudo floating point parsing for info_mask write
attributes (and hence into write_raw). Reject some messed up
strings.
Diffstat (limited to 'include/linux/timer.h')
0 files changed, 0 insertions, 0 deletions