aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/development-process
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-26 20:39:02 +0000
committerMark Brown <broonie@kernel.org>2014-11-26 20:39:02 +0000
commit75ff9420448e7bb30ab8265463595e794ce0c3aa (patch)
treeea00f0cff2f6a272d60a518eb6dde6e14263b5b7 /Documentation/development-process
parentregulator: max77686: Initialize opmode explicitly to normal mode (diff)
parentLinux 3.18-rc4 (diff)
downloadlinux-75ff9420448e7bb30ab8265463595e794ce0c3aa.tar.gz
linux-75ff9420448e7bb30ab8265463595e794ce0c3aa.zip
Merge tag 'v3.18-rc4' into regulator-max77686
Linux 3.18-rc4
Diffstat (limited to 'Documentation/development-process')
-rw-r--r--Documentation/development-process/2.Process4
-rw-r--r--Documentation/development-process/8.Conclusion4
2 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/development-process/2.Process b/Documentation/development-process/2.Process
index 2e0617936e8f..c24e156a6118 100644
--- a/Documentation/development-process/2.Process
+++ b/Documentation/development-process/2.Process
@@ -289,10 +289,6 @@ lists when they are assembled; they can be downloaded from:
http://www.kernel.org/pub/linux/kernel/next/
-Some information about linux-next has been gathered at:
-
- http://linux.f-seidel.de/linux-next/pmwiki/
-
Linux-next has become an integral part of the kernel development process;
all patches merged during a given merge window should really have found
their way into linux-next some time before the merge window opens.
diff --git a/Documentation/development-process/8.Conclusion b/Documentation/development-process/8.Conclusion
index 1990ab4b4949..caef69022e9c 100644
--- a/Documentation/development-process/8.Conclusion
+++ b/Documentation/development-process/8.Conclusion
@@ -22,10 +22,6 @@ Beyond that, a valuable resource for kernel developers is:
http://kernelnewbies.org/
-Information about the linux-next tree gathers at:
-
- http://linux.f-seidel.de/linux-next/pmwiki/
-
And, of course, one should not forget http://kernel.org/, the definitive
location for kernel release information.