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