Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0

Change-Id: I9685feb9277b450da10d78a455b3c0674d6cfe18
Signed-off-by: Todd Poynor <toddpoynor@google.com>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/kernel/smp.c
index 9739bb8a2d2863bc09c715c1b9ce6316a7780540,511eb0397c1ac31bf12a81ffd0df68c816c9f7f2..e895f97ab008844fb97192f67b33d4ea692b03ea
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -641,13 -596,11 +653,15 @@@ asmlinkage void __exception_irq_entry d
                break;
  
        case IPI_CPU_STOP:
+               irq_enter();
                ipi_cpu_stop(cpu);
+               irq_exit();
                break;
  
 +      case IPI_CPU_BACKTRACE:
 +              ipi_cpu_backtrace(cpu, regs);
 +              break;
 +
        default:
                printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%x\n",
                       cpu, ipinr);

diff --cc block/genhd.c
Simple merge

diff --cc drivers/base/power/runtime.c
Simple merge

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

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

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/tun.c
index 76b865065679c756003bdbc3dbb7d491d0b4fd97,a631bf71fee576d9e4be5de023f50a0f0a774471..3cc22b9eda534fc5f4d053601a60b3dfbda06f0c
--- 1/drivers/net/tun.c
--- 2/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@@ -1239,16 -1239,12 +1239,18 @@@ static long __tun_chr_ioctl(struct fil
        int vnet_hdr_sz;
        int ret;
  
-       if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
 +#ifdef CONFIG_ANDROID_PARANOID_NETWORK
 +      if (cmd != TUNGETIFF && !capable(CAP_NET_ADMIN)) {
 +              return -EPERM;
 +      }
 +#endif
 +
+       if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) {
                if (copy_from_user(&ifr, argp, ifreq_len))
                        return -EFAULT;
- 
+       } else {
+               memset(&ifr, 0, sizeof(ifr));
+       }
        if (cmd == TUNGETFEATURES) {
                /* Currently this just means: "what IFF flags are valid?".
                 * This is needed because we never checked for invalid flags on

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

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

diff --cc drivers/usb/host/ehci-q.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

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

diff --cc include/linux/mmc/host.h
index 2cfa8d02e719291ec40ec3807593ce2f09b90784,f8d1e741d80c4adc058192e961074057d516bb38..2e46d530086a63cc5b33257db27ab96eb8bbac50
--- 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 include/linux/sched.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/power/suspend.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/bluetooth/hci_sock.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge

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

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

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

diff --cc net/wireless/core.h
Simple merge

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

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

diff --cc scripts/Kbuild.include
Simple merge