aboutsummaryrefslogtreecommitdiff
path: root/Documentation/HOWTO
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-01-15 08:35:28 +0100
committerBjørn Mork <bjorn@mork.no>2012-01-15 08:35:28 +0100
commit6528209ba2c94f3a0ef946b7d808d9a15b30ec50 (patch)
treec3c1b8bcf8ae19f411c53c2f199f923742bcc256 /Documentation/HOWTO
parenta056fb3687c40b8a1123de1586f491285cb5fb1f (diff)
parentf2ab2a127d480ee20caf8620440ccf13c014447a (diff)
Merge remote branch 'stable/linux-2.6.32.y' into 2.6.32-mantismedia/2.6.32-mantis
Diffstat (limited to 'Documentation/HOWTO')
-rw-r--r--Documentation/HOWTO4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO
index 8495fc97039..cb0863e2d18 100644
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
@@ -275,8 +275,8 @@ versions.
If no 2.6.x.y kernel is available, then the highest numbered 2.6.x
kernel is the current stable kernel.
-2.6.x.y are maintained by the "stable" team <stable@kernel.org>, and are
-released as needs dictate. The normal release period is approximately
+2.6.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and
+are released as needs dictate. The normal release period is approximately
two weeks, but it can be longer if there are no pressing problems. A
security-related problem, instead, can cause a release to happen almost
instantly.