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
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2009-09-19 01:30:01 -04:00
2011-10-24 11:09:41 -07:00
2011-04-29 16:33:36 +02:00
2005-07-11 14:47:41 -07:00
2010-08-04 15:21:40 +02:00
2007-07-30 21:13:43 -04:00
2012-03-21 10:37:25 -07:00
2011-01-12 21:55:09 +01:00
2011-03-21 17:59:37 +01:00
2011-01-12 21:55:08 +01:00
2012-09-23 21:08:33 -07:00
2010-03-05 22:17:23 +01:00
2008-11-12 17:17:17 -08:00
2009-01-06 15:59:18 -08:00
2009-12-09 20:36:08 +01:00
2010-01-11 09:34:06 -08:00
2005-07-11 14:47:41 -07:00
2010-03-05 22:17:25 +01:00
2012-06-17 18:05:06 +02:00
2012-07-21 21:48:37 -07:00
2011-01-12 21:55:13 +01:00
2011-01-09 09:10:10 -08:00
2009-03-30 21:46:41 +02:00
2011-05-25 20:43:33 +02:00
2010-08-14 21:08:54 +02:00
2007-10-09 22:56:28 -04:00
2011-07-03 13:32:53 +02:00
2011-05-25 20:43:31 +02:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2012-07-21 21:48:44 -07:00
2009-06-15 18:39:46 +02:00
2012-09-23 21:08:35 -07:00
2012-05-23 14:15:09 -07:00
2012-03-18 18:27:53 -07:00
2010-08-04 15:21:40 +02:00
2012-04-01 10:25:56 -07:00
2011-03-14 22:36:25 -07:00
2012-01-16 22:51:47 +01:00
2012-09-23 21:08:34 -07:00
2011-10-24 11:09:47 -07:00
2005-07-11 14:47:41 -07:00
2011-07-25 21:46:11 +02:00
2012-03-18 18:27:43 -07:00
2007-05-09 08:58:19 +02:00
2011-03-14 22:36:25 -07:00
2008-10-17 17:51:12 +02:00
2012-03-23 10:02:18 +01:00
2005-07-11 14:47:41 -07:00
2011-01-18 12:22:54 -08:00
2011-07-28 20:16:17 -07:00
2011-07-28 00:17:35 -07:00
2011-10-24 11:09:43 -07:00
2011-03-14 22:39:11 -07:00
2009-10-04 22:53:42 +02:00
2010-08-14 21:08:49 +02:00
2010-10-25 14:11:20 -07:00
2012-09-23 21:08:33 -07:00
2005-07-11 14:47:41 -07:00
2011-07-28 00:17:32 -07:00
2011-03-14 22:36:24 -07:00
2011-05-19 08:19:32 -07:00
2011-05-25 20:43:32 +02:00
2012-03-07 16:08:24 +01:00
2012-03-07 16:08:24 +01:00
2011-09-06 08:56:06 -07:00
2012-03-21 10:37:25 -07:00
2012-03-23 10:02:19 +01:00
2012-09-23 21:08:36 -07:00
2011-07-28 00:17:33 -07:00
2008-10-17 17:51:17 +02:00
2010-08-14 21:08:59 +02:00
2010-10-28 20:31:50 +02:00
2012-03-18 18:27:50 -07:00
2011-10-24 11:09:38 -07:00
2012-03-20 06:42:05 -07:00
2012-03-20 06:42:05 -07:00
2011-05-19 08:19:36 -07:00
2011-01-08 10:56:28 -08:00
2007-05-09 08:58:19 +02:00
2011-04-19 08:49:57 -07:00
2007-07-19 14:22:15 -04:00
2010-08-04 15:21:40 +02:00
2007-05-08 17:21:59 +02:00
2012-07-21 21:48:41 -07:00
2012-01-16 22:51:48 +01:00
2010-08-04 15:21:40 +02:00
2010-05-27 19:58:57 +02:00
2009-06-15 18:39:49 +02:00
2009-09-15 17:18:12 +02:00
2011-03-23 10:42:00 +01:00
2012-03-07 16:08:24 +01:00
2012-03-07 16:08:24 +01:00
2008-02-07 20:39:42 -05:00
2010-08-04 15:21:40 +02:00
2006-09-28 15:31:16 -07:00
2008-04-27 09:23:11 -04:00
2008-02-07 20:39:40 -05:00
2012-03-13 03:48:07 -07:00
2011-01-12 21:55:11 +01:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2010-08-04 15:21:40 +02:00
2011-01-12 21:55:10 +01:00
2011-03-21 17:59:35 +01:00
2012-04-05 16:58:23 -07:00
2009-09-17 09:46:51 +02:00
2012-03-21 10:37:25 -07:00
29b19e2504