Merge commit 'v3.4.2' into android-tegra-nv-3.4
Varun Wadekar [Mon, 11 Jun 2012 05:59:44 +0000 (10:59 +0530)]
Conflicts:
drivers/i2c/busses/i2c-tegra.c
drivers/usb/gadget/fsl_udc_core.c

Change-Id: Ibfc3a8edc3665b832ddc94f89fc17b556629d104
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

13 files changed:
1  2 
arch/arm/Kconfig
drivers/i2c/busses/i2c-tegra.c
drivers/mmc/core/sdio.c
drivers/regulator/core.c
drivers/staging/android/persistent_ram.c
drivers/tty/serial/8250/8250.c
drivers/tty/serial/serial_core.c
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/storage/unusual_devs.h
fs/ext4/super.c
fs/proc/base.c
include/linux/mmc/host.h
kernel/fork.c

Simple merge
@@@ -607,30 -434,8 +606,29 @@@ static irqreturn_t tegra_i2c_isr(int ir
                BUG_ON(i2c_dev->msg_buf_remaining);
                complete(&i2c_dev->msg_complete);
        }
        return IRQ_HANDLED;
 +
  err:
 +      dev_dbg(i2c_dev->dev, "reg: 0x%08x 0x%08x 0x%08x 0x%08x\n",
 +               i2c_readl(i2c_dev, I2C_CNFG), i2c_readl(i2c_dev, I2C_STATUS),
 +               i2c_readl(i2c_dev, I2C_INT_STATUS),
 +               i2c_readl(i2c_dev, I2C_PACKET_TRANSFER_STATUS));
 +
 +      dev_dbg(i2c_dev->dev, "packet: 0x%08x %u 0x%08x\n",
 +               i2c_dev->packet_header, i2c_dev->payload_size,
 +               i2c_dev->io_header);
 +
 +      if (i2c_dev->msgs) {
 +              struct i2c_msg *msgs = i2c_dev->msgs;
 +              int i;
 +
 +              for (i = 0; i < i2c_dev->msgs_num; i++)
 +                      dev_dbg(i2c_dev->dev,
 +                               "msgs[%d] %c, addr=0x%04x, len=%d\n",
 +                               i, (msgs[i].flags & I2C_M_RD) ? 'R' : 'W',
 +                               msgs[i].addr, msgs[i].len);
 +      }
 +
        /* An error occurred, mask all interrupts */
        tegra_i2c_mask_irq(i2c_dev, I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST |
                I2C_INT_PACKET_XFER_COMPLETE | I2C_INT_TX_FIFO_DATA_REQ |
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/proc/base.c
Simple merge
@@@ -298,12 -295,9 +298,13 @@@ struct mmc_host 
        const struct mmc_bus_ops *bus_ops;      /* current bus driver */
        unsigned int            bus_refs;       /* reference counter */
  
 +      unsigned int            bus_resume_flags;
 +#define MMC_BUSRESUME_MANUAL_RESUME   (1 << 0)
 +#define MMC_BUSRESUME_NEEDS_RESUME    (1 << 1)
 +
        unsigned int            sdio_irqs;
        struct task_struct      *sdio_irq_thread;
+       bool                    sdio_irq_pending;
        atomic_t                sdio_irq_thread_abort;
  
        mmc_pm_flag_t           pm_flags;       /* requested pm features */
diff --cc kernel/fork.c
Simple merge