tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: Nikon D80 unusual device patch
EHCI: fix remote wakeup regression in 2.6.21-rc

Linus Torvalds 29ac8cab c48ea603

+8
unified split
+1
drivers/usb/host/ehci-hcd.c
··· 669 669 */ 670 670 ehci->reset_done [i] = jiffies + msecs_to_jiffies (20); 671 671 ehci_dbg (ehci, "port %d remote wakeup\n", i + 1); 672 + mod_timer(&hcd->rh_timer, ehci->reset_done[i]); 672 673 } 673 674 } 674 675
+7
drivers/usb/storage/unusual_devs.h
··· 327 327 US_SC_DEVICE, US_PR_DEVICE, NULL, 328 328 US_FL_FIX_CAPACITY), 329 329 330 + /* Reported by Emil Larsson <emil@swip.net> */ 331 + UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0100, 332 + "NIKON", 333 + "NIKON DSC D80", 334 + US_SC_DEVICE, US_PR_DEVICE, NULL, 335 + US_FL_FIX_CAPACITY), 336 + 330 337 /* BENQ DC5330 331 338 * Reported by Manuel Fombuena <mfombuena@ya.com> and 332 339 * Frank Copeland <fjc@thingy.apana.org.au> */