projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7286c79 f16e6fb)
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Tue, 10 Jan 2012 08:22:59 +0000 (16:22 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 10 Jan 2012 08:22:59 +0000 (16:22 +0800)
Conflicts:
drivers/net/wireless/bcm4329/dhd_common.c

1  2 
drivers/mmc/core/bus.c patch | diff1 | diff2 | blob | history

diff --cc drivers/mmc/core/bus.c
index 25667a59c91e82a24531b8fee75d4423ab7613ee,e07d6c90caecba54af3406dcba5f591078452079..9cd285788afcac909832901c30d91313a39ff67e
mode 100755,100644..100755
--- 1/drivers/mmc/core/bus.c
--- 2/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
Unnamed repository; edit this file 'description' to name the repository.