q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/staging/omap-thermal
History
Len Brown 29b19e2504 Merge branch 'release' of git://git.kernel.org/pub/scm/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>
2012-10-09 01:35:52 -04:00
..
Kconfig staging: omap-thermal: add OMAP5 data structures 2012-07-16 19:04:16 -07:00
Makefile staging: omap-thermal: add OMAP5 data structures 2012-07-16 19:04:16 -07:00
omap-bandgap.c staging: omap-thermal: bandgap: fix setting of alert thresholds 2012-09-21 08:56:40 -07:00
omap-bandgap.h staging: omap-thermal: add OMAP5 data structures 2012-07-16 19:04:16 -07:00
omap-thermal-common.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal 2012-10-09 01:35:52 -04:00
omap-thermal.h
omap4-thermal.c staging: omap-thermal: remove checkpatch.pl warnings on data files 2012-09-11 12:14:16 -07:00
omap5-thermal.c staging: omap-thermal: remove checkpatch.pl warnings on data files 2012-09-11 12:14:16 -07:00
omap_bandgap.txt
TODO