net: wireless: bcmdhd: Fix p2p "linear" IE parsing

Change-Id: Id9e358897529940eaaa6654f67297e1b77f52d15
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
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>
arm: p4notepq-3g_00_defconfig: turn -CONFIG_COMPACTION_RETRY back off

Didn't seem to help (and likely hurt, noticed more stalls)
Merge remote-tracking branch 'gs-common/android-3.0' into kernel-forward

* gs-common/android-3.0:
  gpu: ion: Modify ION_NUM_HEAPS to reflect actual max
  net: wireless: bcmdhd: Fix p2p "linear" IE parsing

Conflicts:
	include/linux/ion.h