David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
int340x_thermal
samsung
st
ti-soc-thermal
armada_thermal.c
clock_cooling.c
cpu_cooling.c
db8500_cpufreq_cooling.c
db8500_thermal.c
dove_thermal.c
fair_share.c
gov_bang_bang.c
imx_thermal.c
intel_powerclamp.c
intel_soc_dts_thermal.c
Kconfig
kirkwood_thermal.c
Makefile
of-thermal.c
rcar_thermal.c
rockchip_thermal.c
spear_thermal.c
step_wise.c
tegra_soctherm.c
thermal_core.c
thermal_core.h
thermal_hwmon.c
thermal_hwmon.h
user_space.c
x86_pkg_temp_thermal.c