This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>