Merge of 'docs' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 2 Jun 2005 23:07:03 +0000 (16:07 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 2 Jun 2005 23:07:03 +0000 (16:07 -0700)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev


Trivial merge