Merge branch 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 May 2012 17:40:11 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 May 2012 17:40:11 +0000 (10:40 -0700)
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

1  2 
Documentation/kernel-parameters.txt

Simple merge