From: Amit Pundir <amit.pundir@linaro.org>
Date: Thu, 4 Jun 2015 06:47:10 +0000 (+0530)
Subject: Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common
X-Git-Tag: firefly_0821_release~3680^2~4^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8556d8602bfa9e2e36e75b1532d9c334f8250220;p=firefly-linux-kernel-4.4.55.git

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

* android-3.10:
  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.
---

8556d8602bfa9e2e36e75b1532d9c334f8250220