diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-10 17:40:42 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-10 17:40:42 -0400 |
| commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
| tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f /Documentation/process | |
| parent | 1420f63b8207e966f54caec26d08abdc2ff37193 (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'Documentation/process')
| -rw-r--r-- | Documentation/process/stable-kernel-rules.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index 11ec2d93a5e0..61e9c78bd6d1 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst | |||
| @@ -124,7 +124,7 @@ specified in the following format in the sign-off area: | |||
| 124 | 124 | ||
| 125 | .. code-block:: none | 125 | .. code-block:: none |
| 126 | 126 | ||
| 127 | Cc: <stable@vger.kernel.org> # 3.3.x- | 127 | Cc: <stable@vger.kernel.org> # 3.3.x |
| 128 | 128 | ||
| 129 | The tag has the meaning of: | 129 | The tag has the meaning of: |
| 130 | 130 | ||