Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
  trivial: remove the trivial patch monkey's name from SubmittingPatches
  trivial: Fix a typo in comment of addrconf_dad_start()
  trivial: usb: fix missing space typo in doc
  trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
  trivial: Remove the hyphen from git commands
  trivial: fix ETIMEOUT -> ETIMEDOUT typos
  trivial: Kconfig: .ko is normally not included in module names
  trivial: SubmittingPatches: fix typo
  trivial: Documentation/dell_rbu.txt: fix typos
  trivial: Fix Pavel's address in MAINTAINERS
  trivial: ftrace:fix description of trace directory
  trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
  trivial: input/misc: Fix typo in Kconfig
  trivial: fix grammo in bus_for_each_dev() kerneldoc
  trivial: rbtree.txt: fix rb_entry() parameters in sample code
  trivial: spelling fix in ppc code comments
  trivial: fix typo in bio_alloc kernel doc
  trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
  trivial: Miscellaneous documentation typo fixes
  trivial: fix typo milisecond/millisecond for documentation and source comments.
  ...

diff --cc Documentation/SubmittingPatches
Simple merge

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

diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc arch/s390/kernel/head.S
Simple merge

diff --cc drivers/block/Kconfig
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/crypto/Kconfig
Simple merge

diff --cc drivers/ide/ide-atapi.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/s390/scsi/zfcp_fc.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_scsi.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge