Merge "msm: sps: Fix error case handling in probe function"
Merge "input: touchscreen: Add threaded irq support to Goodix driver"
Merge "input: touchscreen: request threaded-only IRQs with IRQF_ONESHOT"
Merge "sensors: add enable and poll_delay handle for stk3x1x sensor drver"
input: sensors: add enable and poll_delay handler for mpu3050 sensor driver

The kernel will create the general enable and poll_delay interfaces
in the "/sys/class/sensors/xxx" for each sensor driver using sensor
class interface.

Change-Id: I17ca9822b759ec16393a184ce6bd16458a51ff65
Signed-off-by: Oliver Wang <mengmeng@codeaurora.org>
Merge 4b49dab9ad9cdea42e82bf0cbde1c6ca79acf60a on remote branch

Change-Id: I8068114fe356bcd73047cbbb35850a976c386a7c
sensors: unify the poll delay interface name of bmp18x sensor driver

Change the bmp18x sensor poll delay interface name from "delay" to
"poll_delay", because the "poll_delay" is used as uniform interface.

Change-Id: I380c5d32518eacb9f14985424c22c43d7d985658
Signed-off-by: Jie Cheng <rockiec@codeaurora.org>
tcp: fix FIONREAD/SIOCINQ

tcp_ioctl() tries to take into account if tcp socket received a FIN
to report correct number bytes in receive queue.

But its flaky because if the application ate the last skb,
we return 1 instead of 0.

Correct way to detect that FIN was received is to test SOCK_DONE.

Reported-by: Elliot Hughes <enh@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge "Merge 4b49dab9ad9cdea42e82bf0cbde1c6ca79acf60a on remote branch"
input: misc: mma8x5x cannot change polling delay

Change polling delay of accelerometer mma8x5x will not take effect
because driver never use this new delay.

Change-Id: I8dcc457de46970b90ffcedd0c76dca4da5010884
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
Merge "input: sensors: add enable and poll_delay handler for mpu3050 sensor driver"
Merge "ARM: dts: msm: Move data to devicetree for 8926"
Merge "sensors: unify the poll delay interface name of bmp18x sensor driver"
Merge "tcp: fix FIONREAD/SIOCINQ"
Revert "crypto: Fix memory leak in bam_release call"

This reverts commit I7aa13d5a03edbdfa806345039459feaeac6e7a11, which
release pbam memory when an error occurs. However, on a device with
multiple ce, pbam memory is shared by multiple pce_dev, it can only
be freed when the reference count goes to zero, and can not be
released it if reference count is not zero when an error occurs.
The previous implementation on bam_release was correct, so we
revert commit I7aa13d5a03edbdfa806345039459feaeac6e7a11.

Change-Id: Id8bab91f57fe8056e441afdeae45d7dabbd1eae8
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Merge "ARM: dts: update frequency to corner and quot mapping for CPR on msm8226"
Merge "Input: atmel_mxt_ts - correct sysfs permissions"
msm: mdss: Display splash screen during boot up

It is required to display the splash screen as soon
as fb driver is probed. This shows the device life
at early stage before boot animation rendered by
surface flinger. Current implementation shows the
splash screen only when continuous splash is disabled.

Change-Id: Ib1e049c9ae82a621cc709339414096b954d79a09
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Merge "msm: vidc: Send ABORT in FLUSH command from the Client"
Merge "Merge "msm: vidc: Send ABORT in FLUSH command from the Client""