forked from luck/tmp_suning_uos_patched
a769f30c7b
This resolves the merge errors that were reported in linux-next and it picks up the staging and IIO fixes that we need/want in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
ad_sigma_delta.c | ||
ad799x.c | ||
ad7266.c | ||
ad7291.c | ||
ad7298.c | ||
ad7476.c | ||
ad7766.c | ||
ad7791.c | ||
ad7793.c | ||
ad7887.c | ||
ad7923.c | ||
at91_adc.c | ||
at91-sama5d2_adc.c | ||
axp288_adc.c | ||
bcm_iproc_adc.c | ||
berlin2-adc.c | ||
cc10001_adc.c | ||
da9150-gpadc.c | ||
envelope-detector.c | ||
exynos_adc.c | ||
fsl-imx25-gcq.c | ||
hi8435.c | ||
hx711.c | ||
imx7d_adc.c | ||
ina2xx-adc.c | ||
Kconfig | ||
lp8788_adc.c | ||
lpc18xx_adc.c | ||
ltc2485.c | ||
Makefile | ||
max1027.c | ||
max1363.c | ||
max11100.c | ||
mcp320x.c | ||
mcp3422.c | ||
men_z188_adc.c | ||
meson_saradc.c | ||
mt6577_auxadc.c | ||
mxs-lradc.c | ||
nau7802.c | ||
palmas_gpadc.c | ||
qcom-spmi-iadc.c | ||
qcom-spmi-vadc.c | ||
rcar-gyroadc.c | ||
rockchip_saradc.c | ||
stm32-adc-core.c | ||
stm32-adc-core.h | ||
stm32-adc.c | ||
stx104.c | ||
ti_am335x_adc.c | ||
ti-adc081c.c | ||
ti-adc128s052.c | ||
ti-adc161s626.c | ||
ti-adc0832.c | ||
ti-adc12138.c | ||
ti-ads1015.c | ||
ti-ads7950.c | ||
ti-ads8688.c | ||
ti-tlc4541.c | ||
twl4030-madc.c | ||
twl6030-gpadc.c | ||
vf610_adc.c | ||
viperboard_adc.c | ||
xilinx-xadc-core.c | ||
xilinx-xadc-events.c | ||
xilinx-xadc.h |