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

Pul documentation update from Jon Corbet:
 "Another relatively boring cycle for the docs tree: typo fixes,
  translation updates, etc"

* tag 'docs-for-linus' of git://git.lwn.net/linux:
  modsign: Fix documentation on module signing enforcement parameter.
  Doc: nfs: Fix typos in Documentation/filesystems/nfs
  Documentation: kselftest: Remove duplicate word
  doc: fix grammar
  Documentation: Howto: Fixed subtitles style
  Doc: ARM: Fix a typo in clksrc-change-registers.awk
  Documentation/ko_KR: update maintainer information
  Documentation: Fix int/unsigned int comparison
  Documentation: Chinese translation of arm64/silicon-errata.txt
  Documentation:Update Documentation/zh_CN/arm64/booting.txt
  Documentation: HOWTO: remove obsolete info about regression postings
  Doc: ja_JP: Fix a typo in HOWTO
  Doc: i2c: Fix typo in Documentation/i2c
  Doc: DocBook: Fix a typo in device-drivers.tmpl
  Remove "arch" usage in Documentation/features/list-arch.sh
  README: cosmetic fixes
  Documentation/CodingStyle: add space before parenthesis in example macro
  SubmittingPatches: fix spelling of "git send-email"

diff --combined Documentation/DocBook/device-drivers.tmpl
index cc303a2,6be7590..184f3c7
--- 1/Documentation/DocBook/device-drivers.tmpl
--- 2/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@@ -229,7 -229,6 +229,7 @@@ X!Isound/sound_firmware.
  !Iinclude/media/v4l2-dv-timings.h
  !Iinclude/media/v4l2-event.h
  !Iinclude/media/v4l2-flash-led-class.h
 +!Iinclude/media/v4l2-mc.h
  !Iinclude/media/v4l2-mediabus.h
  !Iinclude/media/v4l2-mem2mem.h
  !Iinclude/media/v4l2-of.h
@@@ -369,7 -368,7 +369,7 @@@ X!Ilib/fonts/fonts.
  !Iinclude/linux/input-polldev.h
  !Edrivers/input/input-polldev.c
       </sect1>
-      <sect1><title>Matrix keyboars/keypads</title>
+      <sect1><title>Matrix keyboards/keypads</title>
  !Iinclude/linux/input/matrix_keypad.h
       </sect1>
       <sect1><title>Sparse keymap support</title>

diff --combined Documentation/ptp/testptp.c
index d99012f,bee2f14..5d2eae1
--- 1/Documentation/ptp/testptp.c
--- 2/Documentation/ptp/testptp.c
+++ b/Documentation/ptp/testptp.c
@@@ -160,7 -160,8 +160,8 @@@ int main(int argc, char *argv[]
  
  
        char *progname;
-       int i, c, cnt, fd;
+       unsigned int i;
+       int c, cnt, fd;
  
        char *device = DEVICE;
        clockid_t clkid;
@@@ -277,15 -278,13 +278,15 @@@
                               "  %d external time stamp channels\n"
                               "  %d programmable periodic signals\n"
                               "  %d pulse per second\n"
 -                             "  %d programmable pins\n",
 +                             "  %d programmable pins\n"
 +                             "  %d cross timestamping\n",
                               caps.max_adj,
                               caps.n_alarm,
                               caps.n_ext_ts,
                               caps.n_per_out,
                               caps.pps,
 -                             caps.n_pins);
 +                             caps.n_pins,
 +                             caps.cross_timestamping);
                }
        }