Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
	arch/arm/mm/cache-v6.S

Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491

diff --cc arch/arm/mm/cache-v6.S
index ea0894f62e078cc74165d0412b150dca1361c14e,47010d8114b00f647e2e202b3262fe96238462ca..2528afc1248fcce532fa3a63ea9996f064b48e94
--- 1/arch/arm/mm/cache-v6.S
--- 2/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@@ -256,17 -264,12 +264,18 @@@ v6_dma_clean_range
   *    - end     - virtual end address of region
   */
  ENTRY(v6_dma_flush_range)
-       bic     r0, r0, #D_CACHE_LINE_SIZE - 1
- 1:
 +#ifdef CONFIG_CACHE_FLUSH_RANGE_LIMIT
 +      sub     r2, r1, r0
 +      cmp     r2, #CONFIG_CACHE_FLUSH_RANGE_LIMIT
 +      bhi     v6_dma_flush_dcache_all
 +#endif
++
  #ifdef CONFIG_DMA_CACHE_RWFO
-       ldr     r2, [r0]                        @ read for ownership
-       str     r2, [r0]                        @ write for ownership
+       ldrb    r2, [r0]                @ read for ownership
+       strb    r2, [r0]                @ write for ownership
  #endif
+       bic     r0, r0, #D_CACHE_LINE_SIZE - 1
+ 1:
  #ifdef HARVARD_CACHE
        mcr     p15, 0, r0, c7, c14, 1          @ clean & invalidate D line
  #else

diff --cc drivers/mmc/core/core.c
index 73e56f2da61f703a3207fdc915b64bc950091a94,9944542951840f6a8ce91cdbe13740ce873a48aa..ad32bd77321f06524ee66f5a12237179e8134841
--- 1/drivers/mmc/core/core.c
--- 2/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@@ -1779,12 -1720,9 +1779,13 @@@ int mmc_pm_notify(struct notifier_bloc
  
        case PM_POST_SUSPEND:
        case PM_POST_HIBERNATION:
+       case PM_POST_RESTORE:
  
                spin_lock_irqsave(&host->lock, flags);
 +              if (mmc_bus_manual_resume(host)) {
 +                      spin_unlock_irqrestore(&host->lock, flags);
 +                      break;
 +              }
                host->rescan_disable = 0;
                spin_unlock_irqrestore(&host->lock, flags);
                mmc_detect_change(host, 0);

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge