From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 11 Apr 2007 22:40:03 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.21-rc7~23
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=29ac8cabd225eaccb2918846f2f2f4e4d99030bd;p=powerpc.git

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
---

29ac8cabd225eaccb2918846f2f2f4e4d99030bd