From: Amit Pundir <amit.pundir@linaro.org>
Date: Sun, 10 May 2015 17:46:55 +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~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52f479da0aef99cffafe73fa04dcbcfc0d4616dc;p=firefly-linux-kernel-4.4.55.git

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

* android-3.10:
  android: fiq_debugger: fix cut-off help message
  ipv4: Missing sk_nulls_node_init() in ping_unhash().
  android: base-cfg: add ALSA
  usb: gadget: add audio dependencies to USB_G_ANDROID
  SELinux: ss: Fix policy write for ioctl operations
  nf: IDLETIMER: Adds the uid field in the msg
  android: configs: Enable SELinux and its dependencies.
  SELinux: use deletion-safe iterator to free list
  subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
---

52f479da0aef99cffafe73fa04dcbcfc0d4616dc