Merge branch 'ion' into p-ti-android-3.8.y-video

This contains the ION cleanup series and caching changes

* ion:
  gpu: ion: add support for more cache operations
  gpu: ion: DRA7: ensure TILER 2d mappings are shared device
  ARM: dts: DRA7/OMAP5: reserve carveout buffers & fix carveout size
  gpu: ion: fix omap_ion_share_fd_to_buffers api
  gpu: ion: omap: add checks for carveout addresses and sizes
  gpu: ion: omap: Fix TILER secure heap base address
  gpu: ion: omap: re-populate flags parameters into buffer

Signed-off-by: Sundar Raman <a0393242@ti.com>

diff --cc arch/arm/boot/dts/dra7-evm.dts
Simple merge