git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Linus Torvalds
authored
Trivial manual merge fixup for usb_find_interface clashes.