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

Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-v3.18-android

* 'android-3.18' 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.
  Fix generic cgroup subsystem permission checks
  uid_cputime: fix cputime overflow
  usb:gadget:Add "state" attribute to android_device
  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