Merge 4.15-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 14:02:04 +0000 (15:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 14:02:04 +0000 (15:02 +0100)
commit87ad3722bfef925ac2379257cbc512d77d8c4d44
tree6df6210af7e3093c6ba5c99d24e435366fa89675
parentf235bcfe6a0b678c16517142d906652a7befed73
parent30a7acd573899fd8b8ac39236eff6468b195ac7d
Merge 4.15-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_cma_heap.c