Merge commit 'v3.4.5' into android-t114-3.4-rebased
Varun Wadekar [Wed, 18 Jul 2012 12:20:45 +0000 (17:20 +0530)]
Linux v3.4.5

Conflicts:
drivers/base/power/main.c

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

12 files changed:
1  2 
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

diff --cc Makefile
Simple merge
  
  static bool is_enabled;
  
- static void tegra_cpu_reset_handler_enable(void)
+ static void __init tegra_cpu_reset_handler_enable(void)
  {
 -      void __iomem *iram_base = IO_ADDRESS(TEGRA_IRAM_RESET_BASE);
 +      void __iomem *iram_base = IO_ADDRESS(TEGRA_IRAM_BASE);
 +#ifndef CONFIG_TRUSTED_FOUNDATIONS
        void __iomem *evp_cpu_reset =
                IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE + 0x100);
        void __iomem *sb_ctrl = IO_ADDRESS(TEGRA_SB_BASE);
Simple merge
@@@ -1063,17 -1030,9 +1063,17 @@@ static int __device_suspend(struct devi
        if (pm_wakeup_pending()) {
                pm_runtime_put_sync(dev);
                async_error = -EBUSY;
-               return 0;
+               goto Complete;
        }
  
 +      data.dev = dev;
 +      data.tsk = get_current();
 +      init_timer_on_stack(&timer);
 +      timer.expires = jiffies + HZ * 12;
 +      timer.function = dpm_drv_timeout;
 +      timer.data = (unsigned long)&data;
 +      add_timer(&timer);
 +
        device_lock(dev);
  
        if (dev->pm_domain) {
  
        device_unlock(dev);
  
 +      del_timer_sync(&timer);
 +      destroy_timer_on_stack(&timer);
 +
+  Complete:
        complete_all(&dev->power.completion);
  
        if (error) {
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge
Simple merge