]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jul 2011 20:56:39 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jul 2011 20:56:39 +0000 (13:56 -0700)
* '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)

86 files changed:
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
arch/arm/mach-shmobile/board-ap4evb.c
arch/microblaze/pci/pci-common.c
arch/powerpc/kernel/pci-common.c
arch/powerpc/platforms/powermac/pci.c
arch/powerpc/sysdev/xics/icp-native.c
arch/sparc/kernel/pci.c
arch/x86/Kconfig
arch/x86/kvm/mmu.c
crypto/Kconfig
drivers/bcma/driver_chipcommon.c
drivers/bcma/driver_chipcommon_pmu.c
drivers/bcma/driver_pci.c
drivers/gpio/gpio-ab8500.c
drivers/gpio/gpio-bt8xx.c
drivers/gpio/gpio-ep93xx.c
drivers/gpio/gpio-u300.c
drivers/mmc/host/dw_mmc.c
drivers/mtd/nand/atmel_nand.c
drivers/net/b44.c
drivers/net/bcm63xx_enet.c
drivers/net/can/softing/softing_main.c
drivers/net/davinci_emac.c
drivers/net/ethoc.c
drivers/net/fec_mpc52xx.c
drivers/net/macb.c
drivers/net/mv643xx_eth.c
drivers/net/natsemi.c
drivers/net/pxa168_eth.c
drivers/net/r8169.c
drivers/net/s2io.h
drivers/net/sungem.c
drivers/net/wireless/ath/ath5k/ahb.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/leds.c
drivers/net/wireless/b43/lo.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/main.h
drivers/net/wireless/b43/phy_a.c
drivers/net/wireless/b43/phy_common.c
drivers/net/wireless/b43/phy_g.c
drivers/net/wireless/b43/phy_lp.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/b43/pio.c
drivers/net/wireless/b43/rfkill.c
drivers/net/wireless/b43/sdio.c
drivers/net/wireless/b43/sysfs.c
drivers/net/wireless/b43/tables_lpphy.c
drivers/net/wireless/b43/wa.c
drivers/net/wireless/b43/xmit.c
drivers/net/wireless/b43legacy/dma.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/b43legacy/xmit.c
drivers/net/wireless/iwlegacy/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
drivers/ssb/driver_chipcommon_pmu.c
drivers/ssb/driver_gige.c
drivers/ssb/driver_pcicore.c
drivers/ssb/main.c
drivers/ssb/pci.c
drivers/ssb/pcihost_wrapper.c
drivers/ssb/scan.c
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/target/tcm_fc/tfc_cmd.c
drivers/target/tcm_fc/tfc_conf.c
drivers/target/tcm_fc/tfc_io.c
drivers/target/tcm_fc/tfc_sess.c
fs/xfs/xfs_dir2_node.c
include/linux/fs.h
include/linux/nl80211.h
include/linux/rtnetlink.h
include/linux/stop_machine.h
include/net/sock.h
kernel/cgroup.c
kernel/exit.c
kernel/power/Kconfig
kernel/sched.c
mm/slub.c
net/netlabel/netlabel_unlabeled.c
sound/pci/ice1712/ice1712.c
sound/soc/ep93xx/ep93xx-i2s.c
sound/soc/ep93xx/ep93xx-pcm.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/omap/ams-delta.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc crypto/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 3bfd3417ab113f9fa596e13563158a0cf2c7c20d,1a0f85225346def76170f88c55c36280dcd7bbfe..72fb9c665320804b43c7e9bff8bcd663fdc2ba74
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4e2d1448093cda6f10bb42041d574c803bea3382,6f3630618fa8de007e18689dcd2ff2bb66505175..7d9c650f395e1399a7185c9338f26b5fd8713db7
@@@ -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>");
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 35eec917f2321b23599f8773416a6c3c48110292,ab843bc1d5d7d8a197d2d6c3cad8ccc5a7fb058b..53e6a10655e1ed346cc8e5ca48e6f70049227da1
  #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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc kernel/exit.c
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/slub.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge