tree 66aba6d4f166f269be95fe4d267d57efe533aefd
parent 303cda0ea7c1c33701812ccb80d37083a4093c7c
parent d4a4f75cd8f29cd9464a5a32e9224a91571d6649
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1433783980 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1433783980 -0700

Merge 4.1-rc7 into driver-core-next

We want the fixes in this branch as well for testing and merge
resolution.

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