diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-04 15:42:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-04 15:42:16 +1000 |
| commit | 53823196033690f2f07382a94c982af486b94abb (patch) | |
| tree | fb6722bb4b451a28d45bd16f37bdb9ac7a798539 /drivers/staging/otus/usbdrv.c | |
| parent | 05e0b339236ee779dc2bdaaa4f8a1a37ce98f3b3 (diff) | |
| parent | d4df4d9ae20a188bca40f32347c04e125507dcb3 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/staging/otus/usbdrv.c')
0 files changed, 0 insertions, 0 deletions