Merge 3.9-rc7 into char-misc-next

We want the fixes in there.

Signed-off-by: Greg Kroah-Hartman <[email protected]>