Merge branch 'android-3.14' of ../../android/aosp into linux-linaro-lsk-v3.14-android
Showing
- Documentation/trace/events-power.txt 1 addition, 0 deletionsDocumentation/trace/events-power.txt
- android/configs/android-base.cfg 1 addition, 1 deletionandroid/configs/android-base.cfg
- drivers/cpufreq/cpufreq.c 1 addition, 0 deletionsdrivers/cpufreq/cpufreq.c
- include/trace/events/power.h 25 additions, 0 deletionsinclude/trace/events/power.h
- include/trace/events/sched.h 25 additions, 0 deletionsinclude/trace/events/sched.h
- kernel/cpu.c 4 additions, 0 deletionskernel/cpu.c
Please register or sign in to comment