David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
int340x_thermal
qcom
samsung
st
tegra
ti-soc-thermal
armada_thermal.c
clock_cooling.c
cpu_cooling.c
db8500_cpufreq_cooling.c
db8500_thermal.c
devfreq_cooling.c
dove_thermal.c
fair_share.c
gov_bang_bang.c
hisi_thermal.c
imx_thermal.c
intel_bxt_pmic_thermal.c
intel_pch_thermal.c	thermal: intel_pch_thermal: Enable Haswell PCH	2016-10-20 14:15:44 +08:00
intel_powerclamp.c	thermal/powerclamp: add back module device table	2016-11-21 20:54:40 +08:00
intel_quark_dts_thermal.c
intel_soc_dts_iosf.c
intel_soc_dts_iosf.h
intel_soc_dts_thermal.c
Kconfig
kirkwood_thermal.c
Makefile
max77620_thermal.c
mtk_thermal.c
of-thermal.c
power_allocator.c
qcom-spmi-temp-alarm.c
qoriq_thermal.c
rcar_thermal.c
rockchip_thermal.c
spear_thermal.c
step_wise.c
tango_thermal.c
thermal-generic-adc.c
thermal_core.c	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
thermal_core.h
thermal_hwmon.c
thermal_hwmon.h
user_space.c
x86_pkg_temp_thermal.c