Nightmare governor: only change nedeed!
Nightmare governor: Fixed frequency stucks at suspend freq when sleep governor is different from nightmare.
Fixed one core "bug" when sleep governor is different from nightmare!
 gpu: ion: Modify ION_NUM_HEAPS to reflect actual max

ION_NUM_HEAPS is meant to represent the actual max number
of heap types in the system, but currently doesn't reflect
any custom heaps.  This patch changes it to 16.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
 net: wireless: bcmdhd: Fix p2p "linear" IE parsing

Change-Id: Id9e358897529940eaaa6654f67297e1b77f52d15
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'upstream/master-jelly-cm-aokp' into master-jelly-cm-aokp
Fixed frequency locked after wakeup when sleep governor is sleepy and different from awake governor.