Merge commit 'v3.4.2' into android-tegra-nv-3.4
authorVarun Wadekar <vwadekar@nvidia.com>
Mon, 11 Jun 2012 05:59:44 +0000 (10:59 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Mon, 11 Jun 2012 05:59:44 +0000 (10:59 +0530)
commite6dca42c2c2ad0f06c6704c73a03e5516dc14b13
tree6ce2385fd736a6fc9a02ace4f5f139a6c8cfbaaf
parent462ba8b0bca7e376722158f1f1a094ba1c0bd1ad
parent1f5547c7f183363eabe07e5d202a49f2e94e995a
Merge commit 'v3.4.2' into android-tegra-nv-3.4

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:
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