Enable CONFIG_NETFILTER_XT_TARGET_LOG option in mako_defconfig

This enables the iptables -j LOG target.  Without this target some existing
apps, such as Network Log, cease to function properly.
msm:vidc: Add the support for MPEG-2 extension and user data

Support is added for MPEG-2 extension and user data. With this
changes Core returns extension and user data as an extradata.

Change-Id: Icdb9da359d90799391b5b9751df2e735ff93475e
Signed-off-by: Shobhit Pandey <cshopan@codeaurora.org>
Revert "Revert "mako: msm: board: enable HS200 bus speed mode support""

This reverts commit e039dcb2ebcf3afcfc133caefb60a6836f437a63.
Revert "usb: ks_bridge: Fix memory leaks in the driver"

This reverts commit d690f360080180740ed0d05b6e34142365bfe9ce.
wlan: Fix for ARP offload issue

Change is to make sure ARP offload works fine
for active sessions when any one out of multiple
session terminated in suspend mode.
Setting of mc/bc filter without considering
ARP offload parameter during DUT suspend mode
was the issue.

CRs-fixed: 452179
Change-Id: I9bd72a43b5bb02df70d63085638b7e8027fcb076
Merge "Enable CONFIG_NETFILTER_XT_TARGET_LOG option in mako_defconfig" into jellybean
Revert "wlan: Fix for ARP offload issue"

This reverts commit 85ba2bc0fc741a663c094ccd84faa3b18d21e292.
Side effects to the hw address (which changes during riva offload)
result in exactly the same final behavior.
Merge branch 'jellybean' of http://github.com/CyanogenMod/lge-kernel-mako into jellybean
msm: camera: Remove unused code used to map userspace buffers.

Remove MSM_CAM_IOCTL_SET_MEM_MAP_INFO IOCTL support, since the
usage of this IOCTL is now depreciated.

Change-Id: I2ca8477fc804a80587bf40dba38904347e9b25aa
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
Mako: Revert msm_fb: remove background invert alpha option for alpha drop pipe

This fixes the pie controls visual glitch when launching apps on the mako and
is required for this http://review.cyanogenmod.org/#/c/35314/ to work.

This reverts: f4f9d28eac1024146c8b074742fcb6793523eb54
  When the blended background pipe has dropped alpha and it is going to
  be blended with foreground pipe on the next stage,
  MDP4_BLEND_BG_ALPHA_FG_CONST is taken. Foreground alpha constant is
  0xFF, so we need to use this alpha value to show background, instead
  of its inverted value.
  Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>

Change-Id: Ie70d1f27dae2751a1eea98fd145145d9b40f3d1d
Make sure PWMs are running in sync.

The 3 (red, green, blue) PWMs were sometimes running out of sync,
depending on the notification LED color flow and timing.

Make sure they are running in sync by
- adjusting the PWM atomically (that is, not adjust each one within its
  own worker task, where other tasks could get run inbetween)
- restarting the PWM if it was running before

Change-Id: Iebddc898c467c11dd412f239a8e26dd22f42c28b
perf: Treat attr.config as u64 in perf_swevent_init()

Trinity discovered that we fail to check all 64 bits of
attr.config passed by user space, resulting to out-of-bounds
access of the perf_swevent_enabled array in
sw_perf_event_destroy().

Introduced in commit b0a873ebb ("perf: Register PMU
implementations").

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: davej@redhat.com
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
msm: audio: qdsp6v2: Add size safety check to ACDB driver

Check that the size sent by userspace is not larger
then the internal amount allowed. This protects
against overflowing the stack due to an invalid size.

Change-Id: I8230fdb00a7b57d398929e8ab0eb6587476f3db1
CRs-fixed: 470222
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
Merge remote branch 'cyanogenmod/cm-10.1' into jb