diff options
| author | Len Brown <len.brown@intel.com> | 2012-06-04 00:35:19 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-06-04 00:35:19 -0400 |
| commit | 7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a (patch) | |
| tree | 65c5898ba93007d4399150c7a127a670bcfbc30d /include/trace/events/workqueue.h | |
| parent | 301f33fbcf4ced53b3de114846ecece5d6aafeeb (diff) | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
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>
Diffstat (limited to 'include/trace/events/workqueue.h')
| -rw-r--r-- | include/trace/events/workqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 7d497291c85d..4018f5058f27 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h | |||
| @@ -103,7 +103,7 @@ TRACE_EVENT(workqueue_execute_start, | |||
| 103 | ); | 103 | ); |
| 104 | 104 | ||
| 105 | /** | 105 | /** |
| 106 | * workqueue_execute_end - called immediately before the workqueue callback | 106 | * workqueue_execute_end - called immediately after the workqueue callback |
| 107 | * @work: pointer to struct work_struct | 107 | * @work: pointer to struct work_struct |
| 108 | * | 108 | * |
| 109 | * Allows to track workqueue execution. | 109 | * Allows to track workqueue execution. |