aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/initrd.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-28 13:40:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-28 13:40:11 -0400
commitd766023eea566bb3c2a57a0567af5b271908fdc2 (patch)
tree45e79163b73c0463075fd7faffadd923aee685b8 /Documentation/initrd.txt
parent905cec410a8b0ff3afb1845d6fe7215e0259b717 (diff)
parent21848d08bea8f057b3e48c00165dfd42e27eb4e9 (diff)
Merge branch 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull documentation updates from Jiri Kosina: "I am currently relaying documentation patches through 'doc' branch of trivial tree, until Rob, the new documentation maintainer, has established a proper tree." * 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: doc: ext3: update documentation with barrier=1 default Documentation/initrd.txt: Change the location of util-linux Documentation/SubmittingPatches: suggested the use of scripts/get_maintainer.pl Documentation/kernel-parameters: remove autotest and mcatest
Diffstat (limited to 'Documentation/initrd.txt')
-rw-r--r--Documentation/initrd.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/initrd.txt b/Documentation/initrd.txt
index 1ba84f3584e3..4e1839ccb555 100644
--- a/Documentation/initrd.txt
+++ b/Documentation/initrd.txt
@@ -362,5 +362,5 @@ Resources
362 http://www.almesberger.net/cv/papers/ols2k-9.ps.gz 362 http://www.almesberger.net/cv/papers/ols2k-9.ps.gz
363[2] newlib package (experimental), with initrd example 363[2] newlib package (experimental), with initrd example
364 http://sources.redhat.com/newlib/ 364 http://sources.redhat.com/newlib/
365[3] Brouwer, Andries; "util-linux: Miscellaneous utilities for Linux" 365[3] util-linux: Miscellaneous utilities for Linux
366 ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/ 366 http://www.kernel.org/pub/linux/utils/util-linux/