Merge 4.15-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Dec 2017 08:12:51 +0000 (09:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Dec 2017 08:12:51 +0000 (09:12 +0100)
commit7f9d04bc568d22e573a10e2a0a316599942786f7
tree5cd3f32a22ebcc0f0faed657da2fbeb5dd5592c5
parent9a38450ac3d1f665fdbe06a2fd2e06fcf70defbc
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b
Merge 4.15-rc4 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/ccree/ssi_hash.c
drivers/staging/pi433/rf69.c