Merge commit 'v3.4.5' into android-t114-3.4-rebased
authorVarun Wadekar <vwadekar@nvidia.com>
Wed, 18 Jul 2012 12:20:45 +0000 (17:20 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Wed, 18 Jul 2012 12:20:45 +0000 (17:20 +0530)
commitfac3a3330e9d5f67f55a11629217220a18133bd5
treea38a68fa3e58febc03cadd4eea37b3b2ffcbe334
parent84b91a0abe3485cbdb09debaf1ccaaa2c6a7d1fa
parent763c71b1319c56272e42cf6ada6994131f0193a7
Merge commit 'v3.4.5' into android-t114-3.4-rebased

Linux v3.4.5

Conflicts:
drivers/base/power/main.c

Change-Id: I782e650a89665caea8aed9e5598234888dc11088
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
12 files changed:
Makefile
arch/arm/mach-tegra/reset.c
arch/arm/mm/mmu.c
drivers/base/power/main.c
drivers/hid/hid-multitouch.c
drivers/iommu/tegra-smmu.c
drivers/pci/pci.c
drivers/usb/storage/unusual_devs.h
fs/exec.c
include/linux/pci.h
mm/shmem.c
sound/pci/hda/hda_codec.c