cpufreq: slim: Move get_cpu_idle_time() to cpufreq.c
Revert "ARM: dts: msm: Add support for second qcrypto device for 8974"

This reverts commit fa5d2199aed8c2aec01cc69f821cb179fe3198ff.
The second crypto device didn't work. And it breaks the l2tp vpn. If no
second hw crypto device, the software crypto will be used.

Change-Id: I125efcf668b60aeed3050eaeca14f3e276763583
Add configs needed for l2tp vpn.

Change-Id: Id636d8bbca77eac7b295c234e6d99713ca6ae0d6
input: touchscreen: Updated TP firmware

Change-Id: I1c30f0b0722e2dfc1ceb1d5e7b1d1d498d3cd8b6
Fix sizeof-pointer-memaccess warning with gcc 4.8

This patch fixes wrong memcpy size when copying ltk value to
HCI_OP_LE_LTK_REPLY command.

Change-Id: I44e5e3da15369d4b424581720ccd3bac820ef2e0

Conflicts:
	net/bluetooth/hci_conn.c
input: touchscreen: Update TP firmware to 14001219

Change-Id: I50b409886c015ae6b0f6cae4c9906d3623d6c3a7
power: qpnp-charger: Increase charge timeout values

* At 500mA it's quite likely the phone has not completely finished
  charging before charging is disabled.
* Increase the wall charger timeout to 10 hours, and the USB charger
  timeout to 16 hours.

Change-Id: Ibb605eeb5119c24109d91e2b5df596672c6ba7c2
net: guard tcp_set_keepalive() to tcp sockets

Its possible to use RAW sockets to get a crash in
tcp_set_keepalive() / sk_reset_timer()

Fix is to make sure socket is a SOCK_STREAM one.

Change-Id: Ieeb498a3e623cfcb54e1c865a3c0229e4acf1e87
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
msm8974: Add UIO region for NV recovery system

Change-Id: I55823b9137cb658bcff1dffb083f7107695b1c97
asoc: msm: Fix compress capture

 * Capture endpoints were not being properly registered, resulting in
   failure to record AMR_WB formats. Fix it.

Change-Id: I898cfdabce862ab4f551c2903e53fe1d3d76a368
bacon: Disable JTAG support

 * This has no place in production.

Change-Id: Iacd267982143e6783cf4e948dd3187d549e16156
Revert "msm8974: oppo: Enable display partial update feature"

This reverts commit 53fd0ddd414d0eda7b2a97b8ea1ae368f96d10dc.
Remove more kernel debugging

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>