summaryrefslogtreecommitdiff
path: root/drivers/staging/quatech_usb2/quatech_usb2.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-02-24 18:42:29 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-02-24 18:42:29 +1100
commitcfb7cc4a46f95413eb9c3ea364ec350ab33fad5a (patch)
tree26c9fe1ca06a5ccdd358b78ccbcb803b900070bb /drivers/staging/quatech_usb2/quatech_usb2.c
parent64c6a00f57d1b0a5d2b5503366f34554a6f64492 (diff)
parent8c741e04e54312b3cf1404a44e3c7460257d58cc (diff)
Merge branch 'quilt/usb'
Conflicts: drivers/usb/early/ehci-dbgp.c
Diffstat (limited to 'drivers/staging/quatech_usb2/quatech_usb2.c')
0 files changed, 0 insertions, 0 deletions