Merge 3.10-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2013 04:18:09 +0000 (21:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Jun 2013 04:18:09 +0000 (21:18 -0700)

Trivial merge