| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Tue, 21 Jul 2015 18:01:53 +0000 (13:01 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Tue, 21 Jul 2015 18:01:53 +0000 (13:01 -0500) | ||
| commit | 7e5c5f0a60416c37c92fe6c830a9dee2299bb3f8 | |
| tree | 9608396127811be01b79d27840cd3a65ae0e74f0 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 9b3626e55257ffc25328b851498651d23d6f9f06 | commit | diff |
| parent | d32df2854cce332ec59d1a5ba32352bf799878f4 | commit | diff |
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common into p-android-3.14
* 'android-3.14' of https://android.googlesource.com/kernel/common:
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
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.
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
ext4: don't save the error information if the block device is read-only
Change-Id: Icdcc50352b5d4adeabced0a5541ed27aa776e425
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'android-3.14' of https://android.googlesource.com/kernel/common:
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
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.
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
ext4: don't save the error information if the block device is read-only
Change-Id: Icdcc50352b5d4adeabced0a5541ed27aa776e425
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>