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	int340x_thermal/processor_thermal_device: return failure when	2015-01-06 08:18:21 +08:00
samsung	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc	2014-12-21 22:49:12 +08:00
st
ti-soc-thermal	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc	2014-12-21 22:49:12 +08:00
armada_thermal.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2014-12-17 10:16:27 -08:00
clock_cooling.c
cpu_cooling.c	Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next	2014-12-24 10:38:30 +08:00
db8500_cpufreq_cooling.c	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc	2014-12-21 22:49:12 +08:00
db8500_thermal.c
dove_thermal.c
fair_share.c
gov_bang_bang.c
imx_thermal.c	Thermal: imx: add clk disable/enable for suspend/resume	2015-01-06 09:35:15 -04:00
intel_powerclamp.c	thermal/powerclamp: add ids for future xeon cpus	2014-12-21 21:36:41 +08:00
intel_soc_dts_thermal.c
Kconfig
kirkwood_thermal.c
Makefile
of-thermal.c	thermal: of: Remove bogus type qualifier for of_thermal_get_trip_points()	2015-01-05 16:03:22 -04:00
rcar_thermal.c	thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/	2015-01-12 16:48:10 -04:00
rockchip_thermal.c	thermal: drop owner assignment from platform_drivers	2014-12-22 11:05:59 +08:00
spear_thermal.c
step_wise.c
tegra_soctherm.c
thermal_core.c	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
thermal_core.h	thermal: of: Remove bogus type qualifier for of_thermal_get_trip_points()	2015-01-05 16:03:22 -04:00
thermal_hwmon.c
thermal_hwmon.h
user_space.c
x86_pkg_temp_thermal.c