From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 20:56:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v3.1-rc1~245
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d3ec4844d449cf7af9e749f73ba2052fb7b72fc2

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

d3ec4844d449cf7af9e749f73ba2052fb7b72fc2
diff --cc drivers/gpio/gpio-ep93xx.c
index 3bfd3417ab11,1a0f85225346..72fb9c665320
--- a/drivers/gpio/gpio-ep93xx.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/net/r8169.c
index 4e2d1448093c,6f3630618fa8..7d9c650f395e
--- a/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/staging/brcm80211/brcmfmac/wl_iw.c
index 35eec917f232,ab843bc1d5d7..53e6a10655e1
--- a/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>