diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-02-05 18:27:49 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-02-05 18:27:49 -0500 |
commit | 1082b4c72f8233ce6403fa7a9c2795d7844f50b2 (patch) | |
tree | 53b44ce1b01bdc2b476fd7e5f8695d906fbfe12c /include/media | |
parent | 8d753cc192e362e40d88673c15dcf9d57f2e411e (diff) | |
parent | 4227cffc1f9e4a9241071354476c225705b614c8 (diff) |
Merge tag 'v3.10.67' into v3.10-rt
This is the 3.10.67 stable release
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions