projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bc313b 20f3d0b)
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Mon, 18 Feb 2013 03:08:41 +0000 (11:08 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 18 Feb 2013 03:08:41 +0000 (11:08 +0800)
Conflicts:
drivers/net/wireless/bcmdhd/Makefile
drivers/net/wireless/bcmdhd/dhd.h
drivers/net/wireless/bcmdhd/dhd_common.c
drivers/net/wireless/bcmdhd/dhd_linux.c
drivers/net/wireless/bcmdhd/include/epivers.h
drivers/net/wireless/bcmdhd/wl_cfg80211.c
drivers/net/wireless/bcmdhd/wl_cfgp2p.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.