Merge branch 3.13-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Dec 2013 16:46:03 +0000 (08:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Dec 2013 16:46:03 +0000 (08:46 -0800)

Trivial merge