Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined MAINTAINERS
index 55727a60b3e8b798b7c49431d8df394acef59937,8e019486b00692b636bab2df7c7d3ad2e1fdeeb8..552e0b692f25e2c0458e55b16c4f27c85c7b7fe8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -485,8 -485,8 +485,8 @@@ S: Maintaine
  F:    drivers/input/mouse/bcm5974.c
  
  APPLE SMC DRIVER
- M:    Nicolas Boichat <[email protected]>
- L:    [email protected]
+ M:    Henrik Rydberg <[email protected]>
+ L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/applesmc.c
  
@@@ -586,6 -586,12 +586,12 @@@ F:       drivers/mtd/nand/bcm_umi_bch.
  F:    drivers/mtd/nand/bcm_umi_hamming.c
  F:    drivers/mtd/nand/nand_bcm_umi.h
  
+ ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
+ M:    Anton Vorontsov <[email protected]>
+ S:    Maintained
+ F:    arch/arm/mach-cns3xxx/
+ T:    git git://git.infradead.org/users/cbou/linux-cns3xxx.git
+ 
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <[email protected]>
  M:    Ryan Mallon <[email protected]>
@@@ -775,11 -781,10 +781,10 @@@ M:      Philipp Zabel <[email protected]
  S:    Maintained
  
  ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
- M:    Lennert Buytenhek <[email protected]>
- M:    Nicolas Pitre <nico@marvell.com>
+ M:    Lennert Buytenhek <[email protected]>
+ M:    Nicolas Pitre <nico@fluxnic.net>
  L:    [email protected] (moderated for non-subscribers)
- T:    git git://git.marvell.com/orion
- S:    Maintained
+ S:    Odd Fixes
  F:    arch/arm/mach-loki/
  F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
@@@ -814,6 -819,7 +819,7 @@@ ARM/QUALCOMM MSM MACHINE SUPPOR
  M:    David Brown <[email protected]>
  M:    Daniel Walker <[email protected]>
  M:    Bryan Huntsman <[email protected]>
+ L:    [email protected]
  F:    arch/arm/mach-msm/
  F:    drivers/video/msm/
  F:    drivers/mmc/host/msm_sdcc.c
@@@ -949,9 -955,8 +955,9 @@@ ARM/SHMOBILE ARM ARCHITECTUR
  M:    Paul Mundt <[email protected]>
  M:    Magnus Damm <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
  W:    http://oss.renesas.com
 +Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
  S:    Supported
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
@@@ -972,6 -977,16 +978,16 @@@ L:       [email protected]
  W:    http://www.mcuos.com
  S:    Maintained
  
+ ARM/U300 MACHINE SUPPORT
+ M:    Linus Walleij <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    arch/arm/mach-u300/
+ F:    drivers/i2c/busses/i2c-stu300.c
+ F:    drivers/rtc/rtc-coh901331.c
+ F:    drivers/watchdog/coh901327_wdt.c
+ F:    drivers/dma/coh901318*
+ 
  ARM/U8500 ARM ARCHITECTURE
  M:    Srinidhi Kasagar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -985,6 -1000,20 +1001,20 @@@ W:     http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/vfp/
  
+ ARM/VOIPAC PXA270 SUPPORT
+ M:    Marek Vasut <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-pxa/vpac270.c
+ F:    arch/arm/mach-pxa/include/mach-pxa/vpac270.h
+ 
+ ARM/ZIPIT Z2 SUPPORT
+ M:    Marek Vasut <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-pxa/z2.c
+ F:    arch/arm/mach-pxa/include/mach-pxa/z2.h
+ 
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
  L:    [email protected]
@@@ -1951,7 -1980,7 +1981,7 @@@ F:      lib/kobj
  
  DRM DRIVERS
  M:    David Airlie <[email protected]>
- L:    dri-devel@lists.sourceforge.net
+ L:    dri-devel@lists.freedesktop.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
  S:    Maintained
  F:    drivers/gpu/drm/
@@@ -2475,12 -2504,6 +2505,6 @@@ L:     [email protected]
  S:    Odd Fixes
  F:    drivers/char/hvc_*
  
- VIRTIO CONSOLE DRIVER
- M:    Amit Shah <[email protected]>
- L:    [email protected]
- S:    Maintained
- F:    drivers/char/virtio_console.c
- 
  iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
  M:    Peter Jones <[email protected]>
  M:    Konrad Rzeszutek Wilk <[email protected]>
@@@ -2950,6 -2973,17 +2974,17 @@@ S:    Odd Fixe
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/ipw2x00/ipw2200.*
  
+ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
+ M:    Joseph Cihula <[email protected]>
+ M:    Shane Wang <[email protected]>
+ L:    [email protected]
+ W:    http://tboot.sourceforge.net
+ T:    Mercurial http://www.bughost.org/repos.hg/tboot.hg
+ S:    Supported
+ F:    Documentation/intel_txt.txt
+ F:    include/linux/tboot.h
+ F:    arch/x86/kernel/tboot.c
+ 
  INTEL WIRELESS WIMAX CONNECTION 2400
  M:    Inaky Perez-Gonzalez <[email protected]>
  M:    [email protected]
@@@ -3621,7 -3655,8 +3656,8 @@@ F:      drivers/net/wireless/mwl8k.
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <[email protected]>
- S:    Maintained
+ S:    Odd Fixes
+ F: drivers/mmc/host/mvsdio.*
  
  MARVELL YUKON / SYSKONNECT DRIVER
  M:    Mirko Lindner <[email protected]>
@@@ -4162,6 -4197,7 +4198,7 @@@ OPROFIL
  M:    Robert Richter <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    arch/*/include/asm/oprofile*.h
  F:    arch/*/oprofile/
  F:    drivers/oprofile/
  F:    include/linux/oprofile.h
@@@ -4350,13 -4386,13 +4387,13 @@@ M:   Paul Mackerras <[email protected]
  M:    Ingo Molnar <[email protected]>
  M:    Arnaldo Carvalho de Melo <[email protected]>
  S:    Supported
- F:    kernel/perf_event.c
+ F:    kernel/perf_event*.c
  F:    include/linux/perf_event.h
- F:    arch/*/kernel/perf_event.c
- F:    arch/*/kernel/*/perf_event.c
- F:    arch/*/kernel/*/*/perf_event.c
+ F:    arch/*/kernel/perf_event*.c
+ F:    arch/*/kernel/*/perf_event*.c
+ F:    arch/*/kernel/*/*/perf_event*.c
  F:    arch/*/include/asm/perf_event.h
- F:    arch/*/lib/perf_event.c
+ F:    arch/*/lib/perf_event*.c
  F:    arch/*/kernel/perf_callchain.c
  F:    tools/perf/
  
@@@ -4479,17 -4515,17 +4516,17 @@@ S:   Maintaine
  F:    drivers/ata/sata_promise.*
  
  PS3 NETWORK SUPPORT
- M:    Geoff Levand <geoff[email protected]>
+ M:    Geoff Levand <geoff@infradead.org>
  L:    [email protected]
  L:    [email protected]
- S:    Supported
+ S:    Maintained
  F:    drivers/net/ps3_gelic_net.*
  
  PS3 PLATFORM SUPPORT
- M:    Geoff Levand <geoff[email protected]>
+ M:    Geoff Levand <geoff@infradead.org>
  L:    [email protected]
  L:    [email protected]
- S:    Supported
+ S:    Maintained
  F:    arch/powerpc/boot/ps3*
  F:    arch/powerpc/include/asm/lv1call.h
  F:    arch/powerpc/include/asm/ps3*.h
@@@ -4788,12 -4824,11 +4825,11 @@@ F:   drivers/s390/crypto
  
  S390 ZFCP DRIVER
  M:    Christof Schmitt <[email protected]>
- M:    Martin Peschke <mp3@de.ibm.com>
+ M:    Swen Schillig <swen@vnet.ibm.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
- F:    Documentation/s390/zfcpdump.txt
  F:    drivers/s390/scsi/zfcp_*
  
  S390 IUCV NETWORK LAYER
@@@ -5119,7 -5154,7 +5155,7 @@@ F:      mm/sl?b.
  
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <[email protected]>
- S:    Maintained
+ S:    Odd Fixes
  F:    drivers/net/smc91x.*
  
  SMSC47B397 HARDWARE MONITOR DRIVER
@@@ -5250,6 -5285,46 +5286,46 @@@ F:    drivers/serial/sunsu.
  F:    drivers/serial/sunzilog.c
  F:    drivers/serial/sunzilog.h
  
+ SPEAR PLATFORM SUPPORT
+ M:    Viresh Kumar <[email protected]>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/plat-spear/
+ 
+ SPEAR3XX MACHINE SUPPORT
+ M:    Viresh Kumar <[email protected]>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/mach-spear3xx/
+ 
+ SPEAR6XX MACHINE SUPPORT
+ M:    Rajeev Kumar <[email protected]>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/mach-spear6xx/
+ 
+ SPEAR CLOCK FRAMEWORK SUPPORT
+ M:    Viresh Kumar <[email protected]>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/mach-spear*/clock.c
+ F:    arch/arm/mach-spear*/include/mach/clkdev.h
+ F:    arch/arm/plat-spear/clock.c
+ F:    arch/arm/plat-spear/include/plat/clock.h and clkdev.h
+ 
+ SPEAR PAD MULTIPLEXING SUPPORT
+ M:    Viresh Kumar <[email protected]>
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    arch/arm/plat-spear/include/plat/padmux.h
+ F:    arch/arm/plat-spear/padmux.c
+ F:    arch/arm/mach-spear*/spear*xx.c
+ F:    arch/arm/mach-spear*/include/mach/generic.h
+ F:    arch/arm/mach-spear3xx/spear3*0.c
+ F:    arch/arm/mach-spear3xx/spear3*0_evb.c
+ F:    arch/arm/mach-spear6xx/spear600.c
+ F:    arch/arm/mach-spear6xx/spear600_evb.c
+ 
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
  M:    Roger Wolff <[email protected]>
  S:    Supported
@@@ -5490,7 -5565,7 +5566,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/tmio_mmc.*
  
  TMPFS (SHMEM FILESYSTEM)
- M:    Hugh Dickins <hugh[email protected]>
+ M:    Hugh Dickins <hugh[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/shmem_fs.h
@@@ -5972,6 -6047,13 +6048,13 @@@ S:    Maintaine
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
  
+ VIRTIO CONSOLE DRIVER
+ M:    Amit Shah <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/char/virtio_console.c
+ F:    include/linux/virtio_console.h
+ 
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <[email protected]>
  L:    [email protected]

diff --combined drivers/dma/shdma.c
index ed3ef22e68a4cb889ce7238f286edf37ea36eccd,323afef77802842ee481d505e4713b500c560967..c2b0172a7589905adcd3bf52ce2798b110ee221f
--- 1/drivers/dma/shdma.c
--- 2/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@@ -189,7 -189,7 +189,7 @@@ static int dmae_set_dmars(struct sh_dma
        struct sh_dmae_device *shdev = container_of(sh_chan->common.device,
                                                struct sh_dmae_device, common);
        struct sh_dmae_pdata *pdata = shdev->pdata;
-       struct sh_dmae_channel *chan_pdata = &pdata->channel[sh_chan->id];
+       const struct sh_dmae_channel *chan_pdata = &pdata->channel[sh_chan->id];
        u16 __iomem *addr = shdev->dmars + chan_pdata->dmars / sizeof(u16);
        int shift = chan_pdata->dmars_bit;
  
@@@ -265,7 -265,7 +265,7 @@@ static struct sh_desc *sh_dmae_get_desc
        return NULL;
  }
  
- static struct sh_dmae_slave_config *sh_dmae_find_slave(
+ static const struct sh_dmae_slave_config *sh_dmae_find_slave(
        struct sh_dmae_chan *sh_chan, struct sh_dmae_slave *param)
  {
        struct dma_device *dma_dev = sh_chan->common.device;
@@@ -289,6 -289,7 +289,7 @@@ static int sh_dmae_alloc_chan_resources
        struct sh_dmae_chan *sh_chan = to_sh_chan(chan);
        struct sh_desc *desc;
        struct sh_dmae_slave *param = chan->private;
+       int ret;
  
        pm_runtime_get_sync(sh_chan->dev);
  
@@@ -297,14 -298,18 +298,18 @@@
         * never runs concurrently with itself or free_chan_resources.
         */
        if (param) {
-               struct sh_dmae_slave_config *cfg;
+               const struct sh_dmae_slave_config *cfg;
  
                cfg = sh_dmae_find_slave(sh_chan, param);
-               if (!cfg)
-                       return -EINVAL;
+               if (!cfg) {
+                       ret = -EINVAL;
+                       goto efindslave;
+               }
  
-               if (test_and_set_bit(param->slave_id, sh_dmae_slave_used))
-                       return -EBUSY;
+               if (test_and_set_bit(param->slave_id, sh_dmae_slave_used)) {
+                       ret = -EBUSY;
+                       goto etestused;
+               }
  
                param->config = cfg;
  
@@@ -333,10 -338,20 +338,20 @@@
        }
        spin_unlock_bh(&sh_chan->desc_lock);
  
-       if (!sh_chan->descs_allocated)
-               pm_runtime_put(sh_chan->dev);
+       if (!sh_chan->descs_allocated) {
+               ret = -ENOMEM;
+               goto edescalloc;
+       }
  
        return sh_chan->descs_allocated;
+ 
+ edescalloc:
+       if (param)
+               clear_bit(param->slave_id, sh_dmae_slave_used);
+ etestused:
+ efindslave:
+       pm_runtime_put(sh_chan->dev);
+       return ret;
  }
  
  /*
@@@ -558,12 -573,14 +573,14 @@@ static struct dma_async_tx_descriptor *
  {
        struct sh_dmae_slave *param;
        struct sh_dmae_chan *sh_chan;
+       dma_addr_t slave_addr;
  
        if (!chan)
                return NULL;
  
        sh_chan = to_sh_chan(chan);
        param = chan->private;
+       slave_addr = param->config->addr;
  
        /* Someone calling slave DMA on a public channel? */
        if (!param || !sg_len) {
@@@ -576,7 -593,7 +593,7 @@@
         * if (param != NULL), this is a successfully requested slave channel,
         * therefore param->config != NULL too.
         */
-       return sh_dmae_prep_sg(sh_chan, sgl, sg_len, &param->config->addr,
+       return sh_dmae_prep_sg(sh_chan, sgl, sg_len, &slave_addr,
                               direction, flags);
  }
  
@@@ -794,7 -811,7 +811,7 @@@ static irqreturn_t sh_dmae_interrupt(in
        return ret;
  }
  
 -#if defined(CONFIG_CPU_SH4)
 +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
  static irqreturn_t sh_dmae_err(int irq, void *data)
  {
        struct sh_dmae_device *shdev = (struct sh_dmae_device *)data;
@@@ -857,7 -874,7 +874,7 @@@ static int __devinit sh_dmae_chan_probe
                                        int irq, unsigned long flags)
  {
        int err;
-       struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id];
+       const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id];
        struct platform_device *pdev = to_platform_device(shdev->common.dev);
        struct sh_dmae_chan *new_sh_chan;
  
@@@ -1035,7 -1052,7 +1052,7 @@@ static int __init sh_dmae_probe(struct 
        /* Default transfer size of 32 bytes requires 32-byte alignment */
        shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE;
  
 -#if defined(CONFIG_CPU_SH4)
 +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
        chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
  
        if (!chanirq_res)
@@@ -1060,7 -1077,7 +1077,7 @@@
  
  #else
        chanirq_res = errirq_res;
 -#endif /* CONFIG_CPU_SH4 */
 +#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */
  
        if (chanirq_res->start == chanirq_res->end &&
            !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) {
@@@ -1107,7 -1124,7 +1124,7 @@@
  chan_probe_err:
        sh_dmae_chan_remove(shdev);
  eirqres:
 -#if defined(CONFIG_CPU_SH4)
 +#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
        free_irq(errirq, shdev);
  eirq_err:
  #endif

diff --combined drivers/i2c/busses/Kconfig
index 41b0754eaf6200574ba80e1366952fde48da12d8,87ab0568bb0ed1e18b979b675a5d8db0303ef545..dec387d3f04d8ce1706e6a3c9934f4f50249e44d
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -529,7 -529,7 +529,7 @@@ config I2C_SH776
  
  config I2C_SH_MOBILE
        tristate "SuperH Mobile I2C Controller"
 -      depends on SUPERH
 +      depends on SUPERH || ARCH_SHMOBILE
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the Renesas SH-Mobile processor.
@@@ -564,7 -564,7 +564,7 @@@ config I2C_STU30
  
  config I2C_VERSATILE
        tristate "ARM Versatile/Realview I2C bus support"
-       depends on ARCH_VERSATILE || ARCH_REALVIEW
+       depends on ARCH_VERSATILE || ARCH_REALVIEW || ARCH_VEXPRESS
        select I2C_ALGOBIT
        help
          Say yes if you want to support the I2C serial bus on ARMs Versatile