diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-23 12:22:16 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 13:27:32 -0500 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /Documentation/DocBook/media.tmpl | |
| parent | 5a9a8d1a99c617df82339456fbdd30d6ed3a856b (diff) | |
| parent | d315777b32a4696feb86f2a0c9e9f39c94683649 (diff) | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'Documentation/DocBook/media.tmpl')
| -rw-r--r-- | Documentation/DocBook/media.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/media.tmpl b/Documentation/DocBook/media.tmpl index f11048d4053f..a99088aae1aa 100644 --- a/Documentation/DocBook/media.tmpl +++ b/Documentation/DocBook/media.tmpl | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | <title>LINUX MEDIA INFRASTRUCTURE API</title> | 28 | <title>LINUX MEDIA INFRASTRUCTURE API</title> |
| 29 | 29 | ||
| 30 | <copyright> | 30 | <copyright> |
| 31 | <year>2009-2010</year> | 31 | <year>2009-2011</year> |
| 32 | <holder>LinuxTV Developers</holder> | 32 | <holder>LinuxTV Developers</holder> |
| 33 | </copyright> | 33 | </copyright> |
| 34 | 34 | ||
| @@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled | |||
| 86 | </author> | 86 | </author> |
| 87 | </authorgroup> | 87 | </authorgroup> |
| 88 | <copyright> | 88 | <copyright> |
| 89 | <year>2009-2010</year> | 89 | <year>2009-2011</year> |
| 90 | <holder>Mauro Carvalho Chehab</holder> | 90 | <holder>Mauro Carvalho Chehab</holder> |
| 91 | </copyright> | 91 | </copyright> |
| 92 | 92 | ||