diff options
author | 2014-03-06 11:33:04 -0800 | |
---|---|---|
committer | 2014-03-06 11:33:04 -0800 | |
commit | d62994701b1e38794a6e4dfc54beb9ae98d3d822 (patch) | |
tree | 648ea7f2e0ccb8cfe9f52fc3fc7ec351678a2004 /drivers/staging/rtl8712/ieee80211.c | |
parent | drivers: staging: rtl8187se: refactor wmm_param_update (diff) | |
parent | iio:adc:vf610 ensure correct handing of interruption of wait for completion (diff) | |
download | linux-dev-d62994701b1e38794a6e4dfc54beb9ae98d3d822.tar.xz linux-dev-d62994701b1e38794a6e4dfc54beb9ae98d3d822.zip |
Merge tag 'iio-for-3.15c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Third IIO new drivers and cleanups series for 3.15.
New driver
* Xilinx XADC driver - This has been ready for a while but was awaiting
a device tree ack (or as it turns out 3+ weeks).
Cleanup
* Drop some unreachable code from mag3110 highlighted by smatch.
Fix
* vf610 - introduced this cycle - put a possible negative error code
into an unsigned long. Another smatch find - this one promoted by
guilt that Dan was busy fixing all our messups.
Diffstat (limited to 'drivers/staging/rtl8712/ieee80211.c')
0 files changed, 0 insertions, 0 deletions