Merge remote-tracking branch 'jc_docs/docs-next'

diff --cc Documentation/Changes
index f447f0516f074c700b0c78ca87fcfcf4595ea49f,268a849c4cc08363cd5f1159a1002c8fe007107c..ec97b77c8b007c6a3bf96e66e1d52847bce69476
--- 1/Documentation/Changes
--- 2/Documentation/Changes
+++ b/Documentation/Changes
@@@ -43,7 -43,8 +43,8 @@@ o  udev                   08
  o  grub                   0.93                    # grub --version || grub-install --version
  o  mcelog                 0.6                     # mcelog --version
  o  iptables               1.4.2                   # iptables -V
 -o  openssl & libcrypto    1.0.1k                  # openssl version
 +o  openssl & libcrypto    1.0.0                   # openssl version
+ o  bc                     1.06.95                 # bc --version
  
  
  Kernel compilation

diff --cc Documentation/DocBook/Makefile
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc scripts/kernel-doc
Simple merge