Merge 3.9-rc7 into driver-core-next

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