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: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)

1 files changed, 3 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 39d8822c3dae..efe0a4b07159 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -696,7 +696,7 @@ T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git
 
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:      Hartley Sweeten <hsweeten@visionengravers.com>
-M:      Ryan Mallon <ryan@bluewatersys.com>
+M:      Ryan Mallon <rmallon@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ep93xx/
@@ -1588,7 +1588,7 @@ F:	Documentation/sound/alsa/Bt87x.txt
 F:      sound/pci/bt87x.c
 
 BT8XXGPIO DRIVER
-M:      Michael Buesch <mb@bu3sch.de>
+M:      Michael Buesch <m@bues.ch>
 W:      http://bu3sch.de/btgpio.php
 S:      Maintained
 F:      drivers/gpio/bt8xxgpio.c
@@ -5910,7 +5910,7 @@ S:	Maintained
 F:      drivers/net/sonic.*
 
 SONICS SILICON BACKPLANE DRIVER (SSB)
-M:      Michael Buesch <mb@bu3sch.de>
+M:      Michael Buesch <m@bues.ch>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/ssb/