aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2004-05-01 11:16:53 +0100
committerAnton Altaparmakov <aia21@cantab.net>2004-05-01 11:16:53 +0100
commit7fec76df170256de3a5e61cbbcc6e26836fc401b (patch)
tree59131d4944572017fe7d8cb024b8efa1ca75b618 /Documentation
parent12b00b39baa26468f96946e1c2aca1a0e9c0800b (diff)
parent2fc0873fe08fd1d01678ee022db184ee5a3bc817 (diff)
downloadhistory-7fec76df170256de3a5e61cbbcc6e26836fc401b.tar.gz
Merge cantab.net:/usr/src/bklinux-2.6 into cantab.net:/usr/src/ntfs-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/SubmittingDrivers2
-rw-r--r--Documentation/kernel-docs.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers
index 69fc15162a0771..af422d9ce43b15 100644
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
@@ -119,7 +119,7 @@ Linux kernel mailing list:
Kernel traffic:
Weekly summary of kernel list activity (much easier to read)
- [http://kt.zork.net/kernel-traffic]
+ http://www.kerneltraffic.org/kernel-traffic/
Linux USB project:
http://sourceforge.net/projects/linux-usb/
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index e46d24a7cf344e..cffca06ad4cefd 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -694,7 +694,7 @@
produced during the week. Published every Thursday.
* Name: "Kernel Traffic"
- URL: http://kt.zork.net/kernel-traffic/
+ URL: http://www.kerneltraffic.org/kernel-traffic/
Keywords: linux-kernel mailing list, weekly kernel news.
Description: Weekly newsletter covering the most relevant
discussions of the linux-kernel mailing list.