diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-07 16:26:56 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-07 16:26:56 +1000 |
commit | 0212731d9ae1dda4f5f65acacb473fa93f09d976 (patch) | |
tree | 118dff07e892dd9f057634d64c44d9ce04685d70 /drivers/staging | |
parent | 623205442d3b45a921e53290caa763401fcd6c98 (diff) | |
parent | e0f6d0446bbb5707ca1040b360dc0f692d62d906 (diff) |
Merge branch 'quilt/usb'
Conflicts:
drivers/usb/serial/sierra.c
Diffstat (limited to 'drivers/staging')
0 files changed, 0 insertions, 0 deletions