Merge tag 'disintegrate-usb-20121009' of git://git.infradead.org/users/dhowells/linux...
Greg Kroah-Hartman [Sat, 13 Oct 2012 21:15:08 +0000 (14:15 -0700)]
UAPI Disintegration 2012-10-09


Trivial merge