diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-11 10:12:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-11 10:12:57 +1000 |
| commit | da9df2f41057d71102668f5ac6b3fc998118a59b (patch) | |
| tree | 8061b865d05043cf25263040ef86d4f54549ce25 /Documentation | |
| parent | d1b8792b636f83804add26ec1ac90a686be19e49 (diff) | |
| parent | a18c0af171bfb875012da26f23df051004726973 (diff) | |
| download | linux-da9df2f41057d71102668f5ac6b3fc998118a59b.tar.bz2 | |
Merge tag 'topic/core-stuff-2014-12-10' of git://anongit.freedesktop.org/drm-intel into drm-next
Merge drm core fixes from Daniel.
* tag 'topic/core-stuff-2014-12-10' of git://anongit.freedesktop.org/drm-intel:
drm: Zero out DRM object memory upon cleanup
drm: fix a typo in a comment
drm: fix a word repetition in a comment
drm: Fix memory leak at error path of drm_read()
drm/Documentation: Fix rowspan value in drm-kms-properties
drm/edid: Restore kerneldoc consistency
drm/edid: new drm_edid_block_checksum helper function V3
drm/edid: shorten log output in case of all zeroes edid block
drm/edid: move drm_edid_is_zero to top, make edid argument const
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 60c1063d4178..7a44d9d43c49 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -2550,7 +2550,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >Description/Restrictions</td> </tr> <tr> - <td rowspan="23" valign="top" >DRM</td> + <td rowspan="25" valign="top" >DRM</td> <td rowspan="4" valign="top" >Generic</td> <td valign="top" >“EDID”</td> <td valign="top" >BLOB | IMMUTABLE</td> |