linux-next: manual merge of the drm-misc tree with the drm tree

From: Stephen Rothwell
Date: Tue Dec 09 2014 - 20:49:51 EST

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in
Documentation/DocBook/drm.tmpl between commit 6f134d7bb434 ("drm/tile:
expose the tile property to userspace (v3)") from the drm tree and
commit e2beb6cd5d0f ("drm/Documentation: Fix rowspan value in
drm-kms-properties") from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc Documentation/DocBook/drm.tmpl
index 60c1063d4178,b344bc3b0d77..000000000000
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@@ -2550,8 -2546,8 +2550,8 @@@ void intel_crt_init(struct drm_device *
<td valign="top" >Description/Restrictions</td>
- <td rowspan="23" valign="top" >DRM</td>
+ <td rowspan="24" valign="top" >DRM</td>
- <td rowspan="3" valign="top" >Generic</td>
+ <td rowspan="4" valign="top" >Generic</td>
<td valign="top" >âEDIDâ</td>
<td valign="top" >BLOB | IMMUTABLE</td>
<td valign="top" >0</td>

Attachment: pgpKTKjRR7bKJ.pgp
Description: OpenPGP digital signature