Merge 3.10-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2013 05:34:53 +0000 (22:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2013 05:34:53 +0000 (22:34 -0700)

Trivial merge