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
Enable rndis support in kernel

Depends on:
http://review.cyanogenmod.org/#/c/29169/

Change-Id: I0963a9abff6981cb613603fb3f98cd73a302f8a3
Merge remote-tracking branch 'goog/android-tegra3-grouper-3.1-jb-mr1.1' into mr1.1-merge
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_asus_grouper into cm-10.1