From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 21 Aug 2012 07:53:18 +0000 (+0800)
Subject: Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb
X-Git-Tag: firefly_0821_release~8882^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=19b3e31e9135e83aae73d4a1ba455919bc817394;p=firefly-linux-kernel-4.4.55.git

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
---

19b3e31e9135e83aae73d4a1ba455919bc817394
diff --cc drivers/mmc/core/core.c
index 51af2722861e,460863422892..3f3615c0af90
mode 100755,100644..100755
--- a/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);