Merge 3.13-rc4 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2013 01:12:04 +0000 (17:12 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2013 01:12:04 +0000 (17:12 -0800)
We want the fixes in here as well.

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

Trivial merge