Merge 3.11-rc3 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 14:43:16 +0000 (07:43 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 14:43:16 +0000 (07:43 -0700)

Trivial merge