tree ac8c5fa24458e7c6d33ceef89260a955a6ccaac8
parent d567b0fe2d63aaf5814f1b488a1b05db53f1849e
parent 41f1830f5a7af77cf5c86359aba3cbd706687e52
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1497925065 +0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1497925065 +0800

Merge 4.12-rc6 into staging-next

We want the staging fixes in here as well.

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