]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitac361dd509450823553e53fbe806e972605aea97
tree6df6210af7e3093c6ba5c99d24e435366fa89675
parentb065a60cde60d277a1a46c1697b57fc394631a7f
parent6ebfdc2edb3a84fa6b52ee806b0bc6b765b33b3e
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