Len Brown
7e1bd6e38b
Merge branch 'upstream' into bugfix-video ...
Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.
Conflicts:
drivers/gpu/drm/gma500/psb_drv.c
text conflict: add comment vs delete neighboring line
keep just this:
/* igd_opregion_init(&dev_priv->opregion_dev); */
/* acpi_video_register(); */
Signed-off-by: Len Brown <len.brown@intel.com>
2012-06-04 00:35:19 -04:00
2012-06-04 00:35:19 -04:00
2012-05-26 12:22:27 -07:00
2012-05-26 12:42:29 -07:00
2012-05-24 16:22:53 -04:00
2012-06-01 10:34:35 -07:00
2012-05-24 11:54:29 -07:00
2012-05-31 08:46:50 +02:00
2012-05-24 11:54:29 -07:00
2012-05-24 12:42:54 -07:00
2012-05-26 13:05:55 -07:00
2012-05-26 12:42:29 -07:00
2012-05-23 14:07:06 -07:00
2012-05-26 12:57:47 -07:00
2012-05-30 12:11:32 -07:00
2012-05-22 16:02:13 -07:00
2012-05-24 12:57:47 -07:00
2012-05-29 18:27:19 -07:00
2012-06-04 00:35:19 -04:00
2012-05-22 19:22:50 -07:00
2012-05-22 16:02:13 -07:00
2012-05-30 07:56:20 +02:00
2012-05-30 10:55:34 +02:00
2012-05-21 17:54:55 -07:00
2012-05-30 10:55:34 +02:00
2012-05-30 08:49:28 -07:00
2012-05-24 11:54:29 -07:00
2012-05-29 16:22:32 -07:00
2012-06-02 17:39:40 -07:00
2012-05-26 12:42:29 -07:00
2012-05-31 18:10:18 -07:00
2012-06-01 02:04:46 +02:00
2012-05-29 11:53:11 -07:00
2012-05-26 12:57:47 -07:00
2012-06-01 16:55:42 -07:00
2012-06-02 17:09:08 -04:00
2012-05-25 11:16:16 -04:00
2012-05-29 18:27:19 -07:00
2012-05-22 19:22:50 -07:00
2012-05-22 16:02:13 -07:00
2012-05-29 18:27:19 -07:00
2012-06-01 02:03:25 +02:00
2012-06-01 15:18:52 -04:00
2012-05-31 12:10:15 -07:00
2012-05-22 19:22:50 -07:00
2012-05-31 17:49:31 -07:00
2012-05-29 11:53:11 -07:00
2012-05-30 08:49:28 -07:00
2012-05-29 16:22:34 -07:00
2012-05-31 10:51:10 -07:00
2012-05-31 12:02:41 -07:00
2012-05-22 19:07:55 +09:00
2012-05-26 13:05:55 -07:00
2012-05-29 16:22:22 -07:00
2012-05-23 16:52:27 -07:00
2012-06-02 15:21:43 -07:00
2012-05-26 12:42:29 -07:00
2012-06-01 16:57:51 -07:00
2012-05-22 12:16:15 +09:30
2012-05-26 12:42:29 -07:00
2012-05-30 08:16:48 +02:00
2012-05-29 20:14:53 -07:00
2012-05-22 16:34:21 -07:00
2012-05-26 12:22:27 -07:00
7e1bd6e38b