projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b507649 b33b4fd)
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Thu, 17 Jan 2013 07:14:24 +0000 (15:14 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 17 Jan 2013 07:14:24 +0000 (15:14 +0800)
commit4e93666a92063aa05813d4e22759cc0d5bac1822
treec8a0f1d13fe405d790aa0dfa8795a0401cce2283tree | snapshot
parentb507649c9a4020d2bbbcacc81351696879b83765commit | diff
parentb33b4fdbb36314cd625b453586cde0060c10a761commit | diff
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0

Conflicts:
drivers/cpufreq/cpufreq_interactive.c
drivers/net/wireless/bcmdhd/dhd_linux.c
drivers/net/wireless/bcmdhd/wl_cfg80211.c
scripts/Kbuild.include
drivers/cpufreq/cpufreq_interactive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.