Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 22:40:03 +0000 (15:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 22:40:03 +0000 (15:40 -0700)
commit29ac8cabd225eaccb2918846f2f2f4e4d99030bd
treead528b5e66399b74fa8266b230f1f999a65628ce
parentc48ea60359a303f3faf5991205b0cdb58dfe6eed
parent2ea547d2dec97b279ba90c7768960856f2116c79
Merge /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