Merge remote-tracking branch 'caf/jb_2.6' into cm-10.2

Conflicts:
	drivers/video/msm/mdp4_overlay.c
net-fixes: flow_dissector: prevent an infinite loop (CVE-2013-4348)

Jason Wang found that a malicious packet could make skb_flow_dissect()
loop forever. We must check that IP header has a valid ihl to avoid
this loop. It involves IPIP encapsulation and ihl = 0 to trigger.

Given this bug is critical, I cooked a patch before having
a fix in upstream kernel.

Tested:

 Compiled/booted
 Ran some tests on bnx2x and explicitely disabled hardware provided rxhash
 ethtool -K eth1 rxhash off
 ethtool -K eth2 rxhash off

Google-Bug-Id: 11465355
Effort: net-fixes
Change-Id: I813e4dc48cecb05f8edfa218304e1f13fd764323
Apexq: fix mipi work queues

* ApexQ is suffering panel wake failures from deep sleep. Replace sleep
wakelock with pm_wakeup.
* Certain panel revs are experiencing long workqueue delays which leads
to visual artifacts. Shorten workqueue interval from 3 * HZ jiffies to 2
* HZ jiffies

Conflicts:
	drivers/video/msm/mipi_samsung_oled.c
remove factory debugging
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_kernel_samsung_d2 into cm-10.2
In-kernel mpdecision tweaks

The original version of in-kernel mpdecision was tuned to lg mako, which has 4 cpu cores and no keyboard. We have only two cores, and do have a keyboard, so the following changes have been made;

1) Boost frequency increased from 918 MHz to 1134 MHz.
2) On a boost event, bring the second CPU core online.
3) On a keyboard event, do not initiate a boost event.
Revert "In-kernel mpdecision tweaks"

Late at night, when you've had no sleep, sometimes you commit the wrong version of the file.
This reverts commit 598149699eb963f13a245a5c6c81df5160ff9937.
In-kernel mpdecision tweaks (try-2)

The original version of in-kernel mpdecision was tuned to lg mako, which has 4 cpu cores and no keyboard. We have only two cores, and do have a keyboard, so the following changes have been made;

1) Boost frequency increased from 918 MHz to 1134 MHz.
2) On a boost event, bring the second CPU core online.
3) On a keyboard event, do not initiate a boost event.