Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common

* android-3.18:
  cpufreq_stats: fix use of cpufreq_for_each_valid_entry() iterator
  initramfs: Add skip_initramfs command line option
  cpu_power: Avoids race condition when the task exits.
  uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit.
  Shrink ashmem directly through shmem_fallocate
  sched: cpufreq: update power usage only if cpufreq_stat is enabled
  cpufreq: Iterate over all the possible cpus to create powerstats.
  uid_cputime: Extends the cputime functionality to report power per uid
  sched: cpufreq: Adds a field cpu_power in the task_struct