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)

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc arch/microblaze/pci/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/pci.c
Simple merge

diff --cc arch/powerpc/sysdev/xics/icp-native.c
Simple merge

diff --cc arch/sparc/kernel/pci.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kvm/mmu.c
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/bcma/driver_chipcommon.c
Simple merge

diff --cc drivers/bcma/driver_chipcommon_pmu.c
Simple merge

diff --cc drivers/bcma/driver_pci.c
Simple merge

diff --cc drivers/gpio/gpio-ab8500.c
Simple merge

diff --cc drivers/gpio/gpio-bt8xx.c
Simple merge

diff --cc drivers/gpio/gpio-ep93xx.c
index 3bfd341,1a0f852..72fb9c6
--- 1/drivers/gpio/gpio-ep93xx.c
--- 2/arch/arm/mach-ep93xx/gpio.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@@ -1,8 -1,9 +1,8 @@@
  /*
 - * linux/arch/arm/mach-ep93xx/gpio.c
 - *
   * Generic EP93xx GPIO handling
   *
-  * Copyright (c) 2008 Ryan Mallon <ryan@bluewatersys.com>
+  * Copyright (c) 2008 Ryan Mallon
 + * Copyright (c) 2011 H Hartley Sweeten <hsweeten@visionengravers.com>
   *
   * Based on code originally from:
   *  linux/arch/arm/mach-ep93xx/core.c

diff --cc drivers/gpio/gpio-u300.c
Simple merge

diff --cc drivers/mmc/host/dw_mmc.c
Simple merge

diff --cc drivers/mtd/nand/atmel_nand.c
Simple merge

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/net/bcm63xx_enet.c
Simple merge

diff --cc drivers/net/can/softing/softing_main.c
Simple merge

diff --cc drivers/net/davinci_emac.c
Simple merge

diff --cc drivers/net/ethoc.c
Simple merge

diff --cc drivers/net/fec_mpc52xx.c
Simple merge

diff --cc drivers/net/macb.c
Simple merge

diff --cc drivers/net/mv643xx_eth.c
Simple merge

diff --cc drivers/net/natsemi.c
Simple merge

diff --cc drivers/net/pxa168_eth.c
Simple merge

diff --cc drivers/net/r8169.c
index 4e2d144,6f36306..7d9c650
--- 1/drivers/net/r8169.c
--- 2/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@@ -682,19 -666,8 +682,19 @@@ struct rtl8169_private 
        struct rtl8169_counters counters;
        u32 saved_wolopts;
  
 -      const struct firmware *fw;
 +      struct rtl_fw {
 +              const struct firmware *fw;
 +
 +#define RTL_VER_SIZE          32
 +
 +              char version[RTL_VER_SIZE];
 +
 +              struct rtl_fw_phy_action {
 +                      __le32 *code;
 +                      size_t size;
 +              } phy_action;
 +      } *rtl_fw;
- #define RTL_FIRMWARE_UNKNOWN  ERR_PTR(-EAGAIN);
+ #define RTL_FIRMWARE_UNKNOWN  ERR_PTR(-EAGAIN)
  };
  
  MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");

diff --cc drivers/net/s2io.h
Simple merge

diff --cc drivers/net/sungem.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/ahb.c
Simple merge

diff --cc drivers/net/wireless/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/b43/leds.c
Simple merge

diff --cc drivers/net/wireless/b43/lo.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/b43/main.h
Simple merge

diff --cc drivers/net/wireless/b43/phy_a.c
Simple merge

diff --cc drivers/net/wireless/b43/phy_common.c
Simple merge

diff --cc drivers/net/wireless/b43/phy_g.c
Simple merge

diff --cc drivers/net/wireless/b43/phy_lp.c
Simple merge

diff --cc drivers/net/wireless/b43/phy_n.c
Simple merge

diff --cc drivers/net/wireless/b43/pio.c
Simple merge

diff --cc drivers/net/wireless/b43/rfkill.c
Simple merge

diff --cc drivers/net/wireless/b43/sdio.c
Simple merge

diff --cc drivers/net/wireless/b43/sysfs.c
Simple merge

diff --cc drivers/net/wireless/b43/tables_lpphy.c
Simple merge

diff --cc drivers/net/wireless/b43/wa.c
Simple merge

diff --cc drivers/net/wireless/b43/xmit.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/dma.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/main.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/xmit.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl-commands.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
Simple merge

diff --cc drivers/ssb/driver_chipcommon_pmu.c
Simple merge

diff --cc drivers/ssb/driver_gige.c
Simple merge

diff --cc drivers/ssb/driver_pcicore.c
Simple merge

diff --cc drivers/ssb/main.c
Simple merge

diff --cc drivers/ssb/pci.c
Simple merge

diff --cc drivers/ssb/pcihost_wrapper.c
Simple merge

diff --cc drivers/ssb/scan.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 35eec91,ab843bc..53e6a10
--- 1/drivers/staging/brcm80211/brcmfmac/wl_iw.c
--- 2/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@@ -18,13 -18,11 +18,12 @@@
  #include <linux/semaphore.h>
  #include <bcmdefs.h>
  #include <linux/netdevice.h>
 +#include <linux/hardirq.h>
  #include <wlioctl.h>
- 
  #include <bcmutils.h>
- 
  #include <linux/if_arp.h>
  #include <asm/uaccess.h>
+ #include <linux/ieee80211.h>
  
  #include <dngl_stats.h>
  #include <dhd.h>

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_conf.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_io.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_sess.c
Simple merge

diff --cc fs/xfs/xfs_dir2_node.c
Simple merge

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

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

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

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

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/power/Kconfig
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc net/netlabel/netlabel_unlabeled.c
Simple merge

diff --cc sound/pci/ice1712/ice1712.c
Simple merge

diff --cc sound/soc/ep93xx/ep93xx-i2s.c
Simple merge

diff --cc sound/soc/ep93xx/ep93xx-pcm.c
Simple merge

diff --cc sound/soc/fsl/mpc5200_dma.c
Simple merge

diff --cc sound/soc/omap/ams-delta.c
Simple merge