Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...

* 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android:
  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

diff --cc drivers/cpufreq/cpufreq_interactive.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge