Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb

Conflicts:
	drivers/mmc/core/core.c
	drivers/net/wireless/bcm4319/dhd_sdio.c
	drivers/net/wireless/bcm4319/include/linux_osl.h
	drivers/net/wireless/bcm4319/wl_iw.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mmc/core/core.c
index 51af2722861ed6a795fb9fc79671f92e345fd1f3,460863422892daedb831d14a1ac2bd0a902c1ab3..3f3615c0af90e415db97bc76ce48b1bc37551581
mode 100755,100644..100755
--- 1/drivers/mmc/core/core.c
--- 2/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@@ -2030,7 -1851,7 +2030,8 @@@ int mmc_suspend_host(struct mmc_host *h
                        host->pm_flags = 0;
                        err = 0;
                }
 +#endif
+               flush_delayed_work(&host->disable);
        }
        mmc_bus_put(host);