Merge tag 'v3.0.36' into android-3.0.x

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/mmc/core/sdio.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc include/linux/mmc/host.h
index 2cfa8d0,f8d1e74..2e46d53
--- 1/include/linux/mmc/host.h
--- 2/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@@ -267,12 -265,9 +267,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

diff --cc kernel/sched.c
Simple merge

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

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge