Merge 3.10-rc3 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2013 01:40:19 +0000 (10:40 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2013 01:40:19 +0000 (10:40 +0900)
We want the changes in here.

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

Trivial merge