cpufreq: performance: lock to 4 cores
mach-tegra: cpu-tegra3.c: ignore PMQOS max cpus when hotplugging based on runnable threads.
adjust thresholds as well
Revert "mach-tegra: cpu-tegra3.c: ignore PMQOS max cpus when hotplugging based on runnable threads."

This reverts commit 98986c61267dc1ee3f3296d71ee90937943e3f7c.
net: wireless: bcmdhd: Enable P2P probe request handling only during discovery

Change-Id: I2db29d5ed7f66f2a45feb890c81d510fcad24dd2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
video: tegra: host: better error handling in alloc_gathers()

We should return -ENOMEM in alloc_gathers() when get a NULL pointer
from nvmap_alloc() or nvmap_mmap()

Bug 1178135

Change-Id: I29321710343983a6e733d95b10a1f7eb586246c0
Signed-off-by: Haley Teng <hteng@nvidia.com>
Proximity: Enable sensor by it's previous RIL setting when device resume from suspend.

Change-Id: Id5b0bfaa79d62e5c41fa704470cf82bf7a0fefac
Merge remote-tracking branch 'upstream/alpha-mr1.1' into alpha2