| commit | 29b19e250434c6193c8b8e4c34c9c6284dd4f101 | |
| author | Len Brown <len.brown@intel.com> | |
| Tue, 9 Oct 2012 05:35:52 +0000 (9 01:35 -0400) | ||
| committer | Len Brown <len.brown@intel.com> | |
| Tue, 9 Oct 2012 05:35:52 +0000 (9 01:35 -0400) | ||
| tree | 8a1c8e308c9ae964f7fb612e921e10cf4c30ba15 | treesnapshot (tar.gz zip) |
| parent | 125c4c706b680c7831f0966ff873c1ad0354ec25 | commitdiff |
| parent | c072fed95c9855a920c114d7fa3351f0f54ea06e | commitdiff |
Merge branch 'release' of git://git./linux/kernel/git/rzhang/linux into thermal
Conflicts:
drivers/staging/omap-thermal/omap-thermal-common.
OMAP supplied dummy TC1 and TC2,
at the same time that the thermal tree removed them
from thermal_zone_device_register()
drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
propogate the upstream MAX_IDR_LEVEL re-name
to prevent a build failure
Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Len Brown <len.brown@intel.com>
Conflicts:
drivers/staging/omap-thermal/omap-thermal-common.
OMAP supplied dummy TC1 and TC2,
at the same time that the thermal tree removed them
from thermal_zone_device_register()
drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
propogate the upstream MAX_IDR_LEVEL re-name
to prevent a build failure
Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Len Brown <len.brown@intel.com>