[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm tree

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

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>
  	</tr>
  	<tr>
- 	<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>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20141210/a4874d74/attachment.sig>