gpu: ion: Add ION Memory Manager

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
[jstultz: Squished in Colin Cross' move to staging change,
also disables ION from the build, as it won't compile till
the end of the patchset]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc drivers/staging/android/Makefile
Simple merge

diff --cc drivers/staging/android/ion/Kconfig
Simple merge

diff --cc drivers/staging/android/ion/Makefile
Simple merge

diff --cc drivers/staging/android/ion/ion.c
Simple merge

diff --cc drivers/staging/android/ion/ion.h
Simple merge

diff --cc drivers/staging/android/ion/ion_carveout_heap.c
Simple merge

diff --cc drivers/staging/android/ion/ion_heap.c
Simple merge

diff --cc drivers/staging/android/ion/ion_priv.h
Simple merge

diff --cc drivers/staging/android/ion/ion_system_heap.c
Simple merge

diff --cc drivers/staging/android/ion/ion_system_mapper.c
Simple merge

diff --cc drivers/staging/android/ion/tegra/Makefile
Simple merge

diff --cc drivers/staging/android/ion/tegra/tegra_ion.c
Simple merge