summaryrefslogtreecommitdiff
path: root/include/trace/events/jbd2.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/trace/events/jbd2.h')
0 files changed, 0 insertions, 0 deletions
ref='/cgit.cgi/linux/net-next.git/commit/Documentation?id=1c1a24d2db35d9e1b6d2a012a7d51af8be8011ac'>1c1a24d2db35d9e1b6d2a012a7d51af8be8011ac (diff)parenta0877f52035280370707bdefeddc6faa6478b892 (diff)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at the nonblocking atomic helpers, needed to merge the i915 conversion. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation')