Merge 4.12-rc2 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 May 2017 06:56:55 +0000 (08:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 May 2017 06:56:55 +0000 (08:56 +0200)
commitb4a338d2b3cafa1be68d4e1903203c7e08a38ee5
tree069f3753af1cda34c36a7627000ab46ef5c51c83
parent34cfb106d1f8a746fcccbe61c852f705dcdceaa2
parent08332893e37af6ae779367e78e444f8f9571511d
Merge 4.12-rc2 into char-misc-next

We want the fixes in here as well to handle merge issues.

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