]> 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)
commit1e331806a2f9e4aa3811b181f2697b96e283f1ea
tree6df6210af7e3093c6ba5c99d24e435366fa89675
parent371df6bf735fb2e5cd7da714e83ff649b22f1fd6
parenta84115cf8f1b7e7f9af05092818090627e3dae6d
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