5991205b0cdb58dfe6eed
parent 2ea547d2dec97b279ba90c7768960856f2116c79
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1176331203 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1176331203 -0700

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