Merge tag 'docs-4.5' of git://git.lwn.net/linux

Pull documentation updates from Jon Corbet:
 "A relatively boring cycle in the docs tree.  There's a few kernel-doc
  fixes and various document tweaks.

  One patch reaches out of the documentation subtree to fix a comment in
  init/do_mounts_rd.c.  There didn't seem to be anybody more appropriate
  to take that one, so I accepted it"

* tag 'docs-4.5' of git://git.lwn.net/linux: (29 commits)
  thermal: add description for integral_cutoff unit
  Documentation: update libhugetlbfs site url
  Documentation: Explain pci=conf1,conf2 more verbosely
  DMA-API: fix confusing sentence in Documentation/DMA-API.txt
  Documentation: translations: update linux cross reference link
  Documentation: fix typo in CodingStyle
  init, Documentation: Remove ramdisk_blocksize mentions
  Documentation-getdelays: Apply a recommendation from "checkpatch.pl" in main()
  Documentation: HOWTO: update versions from 3.x to 4.x
  Documentation: remove outdated references from translations
  Doc: treewide: Fix grammar "a" to "an"
  Documentation: cpu-hotplug: Fix sysfs mount instructions
  can-doc: Add hint about getting timestamps
  Fix CFQ I/O scheduler parameter name in documentation
  Documentation: arm: remove dead links from Marvell Berlin docs
  Documentation: HOWTO: update code cross reference link
  Doc: Docbook/iio: Fix typo in iio.tmpl
  DocBook: make index.html generation less verbose by default
  DocBook: Cleanup: remove an unused $(call) line
  DocBook: Add a help message for DOCBOOKS env var
  ...

1 files changed, 10 insertions, 7 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 5a6235ed3663..3ea869d7a31c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2748,10 +2748,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                 hardware access methods are allowed. Use this
                                 if you experience crashes upon bootup and you
                                 suspect they are caused by the BIOS.
-                conf1           [X86] Force use of PCI Configuration
-                                Mechanism 1.
-                conf2           [X86] Force use of PCI Configuration
-                                Mechanism 2.
+                conf1           [X86] Force use of PCI Configuration Access
+                                Mechanism 1 (config address in IO port 0xCF8,
+                                data in IO port 0xCFC, both 32-bit).
+                conf2           [X86] Force use of PCI Configuration Access
+                                Mechanism 2 (IO port 0xCF8 is an 8-bit port for
+                                the function, IO port 0xCFA, also 8-bit, sets
+                                bus number. The config space is then accessed
+                                through ports 0xC000-0xCFFF).
+                                See http://wiki.osdev.org/PCI for more info
+                                on the configuration access mechanisms.
                 noaer           [PCIE] If the PCIEAER kernel config parameter is
                                 enabled, this kernel boot option can be used to
                                 disable the use of PCIE advanced error reporting.
@@ -3071,9 +3077,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         raid=           [HW,RAID]
                         See Documentation/md.txt.
 
-        ramdisk_blocksize=      [RAM]
-                        See Documentation/blockdev/ramdisk.txt.
-
         ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
                         See Documentation/blockdev/ramdisk.txt.