summaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/xgmac.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-11 15:40:03 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-11 15:40:03 -0700
commit29ac8cabd225eaccb2918846f2f2f4e4d99030bd (patch)
treead528b5e66399b74fa8266b230f1f999a65628ce /drivers/net/cxgb3/xgmac.c
parentc48ea60359a303f3faf5991205b0cdb58dfe6eed (diff)
parent2ea547d2dec97b279ba90c7768960856f2116c79 (diff)
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
Diffstat (limited to 'drivers/net/cxgb3/xgmac.c')
0 files changed, 0 insertions, 0 deletions