diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 07:13:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 07:13:38 -0700 |
| commit | 451372066dab1d98ba571b176bd1ce71922702f2 (patch) | |
| tree | f4d779ea1508ca435505e4caa8ca6acf5fc8948f /include/linux/socket.h | |
| parent | staging: octeon-usb: cvmx-usbcx-defs.h: reformat license text to fit 80 cols (diff) | |
| parent | iio:trigger:interrupt fix formatting of rsize variable in name (diff) | |
Merge tag 'iio-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Second round of IIO new stuff and cleanups for the 3.11 cycle.
1) Pressure sensor support in the st sensors driver - LPS331AP currently.
2) Graduation of generic interrupt from staging with some related cleanup.
3) A number of platform_set_drvdata on remove removals.
4) 2 conditional build changes to prevent device tree structures from being
built in when device tree isn't enabled. These just save a bit of space
rather than being strictly required at the moment.
5) A couple of strict_strtoul -> kstrtoul conversions.
Diffstat (limited to 'include/linux/socket.h')
0 files changed, 0 insertions, 0 deletions