diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-04 12:25:25 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-04 12:25:25 -0700 |
| commit | 0c9561b6f843fad1954e32ed780842f9b6750938 (patch) | |
| tree | 806f7e581c7c6d1e595e8df8c7dbf3c616e84c0d /arch/x86/kvm/i8254.c | |
| parent | bd4e9a26373331ef6f185500c72a8836eb7c82d9 (diff) | |
| parent | 7bcb35707461da71ab35d102536810b1876a7762 (diff) | |
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-v3.14-android
* 'android-3.14' of https://android.googlesource.com/kernel/common:
usb: gadget: fix NULL ptr derefer while symlinking PTP func
uid_cputime: Iterates over all the threads instead of processes.
uid_cputime: fix cputime overflow
initramfs: Add skip_initramfs command line option
cpu_power: Avoids race condition when the task exits.
of: add empty of_find_node_by_path() for !OF
uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit.
Shrink ashmem directly through shmem_fallocate
cpufreq: Iterate over all the possible cpus to create powerstats.
sched: cpufreq: update power usage only if cpufreq_stat is enabled
Diffstat (limited to 'arch/x86/kvm/i8254.c')
0 files changed, 0 insertions, 0 deletions