summaryrefslogtreecommitdiffstats
path: root/Documentation/process
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-04-10 23:40:42 +0200
committerDave Airlie <airlied@redhat.com>2017-04-10 23:40:42 +0200
commitb769fefb68cd70385d68220ae341e5a10723fbc0 (patch)
treea2881410c9dc5a3474619d155fac981cfbd4ee8f /Documentation/process
parentMerge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux int... (diff)
parentLinux 4.11-rc6 (diff)
downloadlinux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.xz
linux-b769fefb68cd70385d68220ae341e5a10723fbc0.zip
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.rst2
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:
.. code-block:: none
- Cc: <stable@vger.kernel.org> # 3.3.x-
+ Cc: <stable@vger.kernel.org> # 3.3.x
The tag has the meaning of: