tree b30f266e85047244dcdb47d5afc134e76aec530d
parent db809859c8cee415293b830e67178f526d1eb2be
parent 30a7acd573899fd8b8ac39236eff6468b195ac7d
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1514900795 +0100
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1514900795 +0100

Merge 4.15-rc6 into char-misc-next

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>