diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-24 10:40:17 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-24 10:40:17 -0700 |
commit | dae04c1c00f74dd21cce9d85ce90ff50b26d4741 (patch) | |
tree | dbdf5ba4cb6a362e14db7088abb34998a52382bc /drivers/amba | |
parent | f5e3fc58ccc95572560d0beae9e4e7c1bd94ca6d (diff) | |
parent | 1b1c8d6849655e6924c453e5ad377157f65eb950 (diff) |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.10-android
* 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android:
sched: cpufreq: update power usage only if cpufreq_stat is enabled
uid_cputime: Extends the cputime functionality to report power per uid
sched: cpufreq: Adds a field cpu_power in the task_struct
cpufreq_stats: Adds the fucntionality to load current values for each frequency for all the cores.
android: drivers: workaround debugfs race in binder
neigh: Better handling of transition to NUD_PROBE state
New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
net/unix: sk_socket can disappear when state is unlocked
selinux: enable genfscon labeling for sysfs and pstore files
selinux: enable per-file labeling for debugfs files.
ext4: don't save the error information if the block device is read-only
suspend: Return error when pending wakeup source is found.
proc: uid_cputime: fix show_uid_stat permission
power: increment wakeup_count when save_wakeup_count failed.
power: validate wakeup source before activating it.
Diffstat (limited to 'drivers/amba')
0 files changed, 0 insertions, 0 deletions