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

Pull "trivial tree" updates from Jiri Kosina:
 "Usual pile from trivial tree everyone is so eagerly waiting for"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Remove MN10300_PROC_MN2WS0038
  mei: fix comments
  treewide: Fix typos in Kconfig
  kprobes: update jprobe_example.c for do_fork() change
  Documentation: change "&" to "and" in Documentation/applying-patches.txt
  Documentation: remove obsolete pcmcia-cs from Changes
  Documentation: update links in Changes
  Documentation: Docbook: Fix generated DocBook/kernel-api.xml
  score: Remove GENERIC_HAS_IOMAP
  gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
  tty: doc: Fix grammar in serial/tty
  dma-debug: modify check_for_stack output
  treewide: fix errors in printk
  genirq: fix reference in devm_request_threaded_irq comment
  treewide: fix synchronize_rcu() in comments
  checkstack.pl: port to AArch64
  doc: queue-sysfs: minor fixes
  init/do_mounts: better syntax description
  MIPS: fix comment spelling
  powerpc/simpleboot: fix comment
  ...

diff --cc Documentation/devicetree/bindings/clock/arm-integrator.txt
index ecc69520bceaa11542e8b7905dc3a52e1dc754a5,4458d46eab699ce02451df503fa49b6bd7722876..11f5f95f571bef74a2f0166e353b840ffd2ff580
--- 1/Documentation/devicetree/bindings/clock/arm-integrator.txt
--- 2/Documentation/devicetree/bindings/clock/arm-integrator.txt
+++ b/Documentation/devicetree/bindings/clock/arm-integrator.txt
@@@ -1,6 -1,6 +1,6 @@@
 -Clock bindings for ARM Integrator Core Module clocks
 +Clock bindings for ARM Integrator and Versatile Core Module clocks
  
- Auxilary Oscillator Clock
+ Auxiliary Oscillator Clock
  
  This is a configurable clock fed from a 24 MHz chrystal,
  used for generating e.g. video clocks. It is located on the

diff --cc Documentation/devicetree/bindings/mfd/s2mps11.txt
Simple merge

diff --cc Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Simple merge

diff --cc Documentation/devicetree/bindings/net/stmmac.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/devicetree/bindings/video/atmel,lcdc.txt
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/hotplug-memory.c
index 17ee193960a09aab4e5e4502525f4b55788bdcce,369da0f09066c4215314a0173940ab994506c469..34064f50945ef22a1246c8201556c7dc75a7cc8e
--- 1/arch/powerpc/platforms/pseries/hotplug-memory.c
--- 2/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@@ -200,13 -200,13 +200,13 @@@ static int pseries_update_drconf_memory
  
        /* The first int of the property is the number of lmb's described
         * by the property. This is followed by an array of of_drconf_cell
-        * entries. Get the niumber of entries and skip to the array of
+        * entries. Get the number of entries and skip to the array of
         * of_drconf_cell's.
         */
 -      entries = *p++;
 +      entries = be32_to_cpu(*p++);
        old_drmem = (struct of_drconf_cell *)p;
  
 -      p = (u32 *)pr->prop->value;
 +      p = (__be32 *)pr->prop->value;
        p++;
        new_drmem = (struct of_drconf_cell *)p;
  

diff --cc block/blk-core.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_bios.c
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
Simple merge

diff --cc drivers/irqchip/Kconfig
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/cmd.c
Simple merge

diff --cc drivers/net/ethernet/via/via-velocity.c
Simple merge

diff --cc drivers/platform/x86/Kconfig
Simple merge

diff --cc fs/btrfs/tree-log.c
Simple merge

diff --cc include/linux/gpio/driver.h
index e78a2373e37453776a3cec8d6e9d6aea93738f24,4fcd60913a4218070661a80d79ad86abf7b56b7d..c5e41da20112e3a244d2cd9672b2bc5b7f703184
--- 1/include/linux/gpio/driver.h
--- 2/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@@ -164,11 -221,8 +164,11 @@@ int gpiochip_irqchip_add(struct gpio_ch
                irq_flow_handler_t handler,
                unsigned int type);
  
- #endif /* CONFIG_GPIO_IRQCHIP */
+ #endif /* CONFIG_GPIOLIB_IRQCHIP */
  
 +int gpiochip_request_own_desc(struct gpio_desc *desc, const char *label);
 +void gpiochip_free_own_desc(struct gpio_desc *desc);
 +
  #else /* CONFIG_GPIOLIB */
  
  static inline struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)

diff --cc include/linux/pagemap.h
Simple merge

diff --cc include/linux/percpu-refcount.h
Simple merge

diff --cc lib/bitmap.c
Simple merge

diff --cc lib/idr.c
Simple merge

diff --cc lib/rhashtable.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc net/mac802154/wpan.c
Simple merge

diff --cc scripts/checkstack.pl
Simple merge