From: 黄涛 Date: Mon, 18 Feb 2013 03:08:41 +0000 (+0800) Subject: Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0 X-Git-Tag: firefly_0821_release~7613 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ce1addf6e46177b549851118fca59427b1b9dd6c;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0 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 --- ce1addf6e46177b549851118fca59427b1b9dd6c