From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2014 01:16:26 +0000 (-0400)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=28596c9722289b2f98fa83a2e4351eb0a031b953;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-linus' of git://git./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
  ...
---

28596c9722289b2f98fa83a2e4351eb0a031b953
diff --cc Documentation/devicetree/bindings/clock/arm-integrator.txt
index ecc69520bcea,4458d46eab69..11f5f95f571b
--- a/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 arch/powerpc/platforms/pseries/hotplug-memory.c
index 17ee193960a0,369da0f09066..34064f50945e
--- a/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 include/linux/gpio/driver.h
index e78a2373e374,4fcd60913a42..c5e41da20112
--- a/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)