Merge remote-tracking branch 'jc_docs/docs-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:11:10 +0000 (13:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:11:10 +0000 (13:11 +1100)
1  2 
Documentation/Changes
Documentation/DocBook/Makefile
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
scripts/kernel-doc

@@@ -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
Simple merge
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge