From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 10 Jan 2012 08:22:59 +0000 (+0800)
Subject: Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
X-Git-Tag: firefly_0821_release~9679
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af3be323f4f4d5ec3948b1870b2e26908d06afab;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/net/wireless/bcm4329/dhd_common.c
---

af3be323f4f4d5ec3948b1870b2e26908d06afab
diff --cc drivers/mmc/core/bus.c
index 25667a59c91e,e07d6c90caec..9cd285788afc
mode 100755,100644..100755
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c