Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:14:15 +0000 (05:14 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:14:15 +0000 (05:14 -0500)
commit156d821270e131dee7d89fc4aa385f0f9b1900ea
tree2d3a4bfea184033c1eae48846ecd357c82021e85
parent3e098984073795bff5e5e3edbc1f5b0514c47c92
parent5b275ce27077d6463ca28c9671dce7c2c1f622e2
Merge branch 'misc' into release
drivers/thermal/thermal_sys.c
include/linux/thermal.h