diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-19 12:16:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-19 12:16:54 +1000 |
| commit | 2ac6b7797af6d518337093bfb4c00357cbbbf7c4 (patch) | |
| tree | 5c28811888a3abb664385117d3a1d7f4f9e4be68 /drivers/staging/comedi/drivers/quatech_daqp_cs.c | |
| parent | 707d1a14f16164add7a60e5907716e1961d6dfe1 (diff) | |
| parent | b9e0f0e917461425ea17308ecc3d7d02961b2b30 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/media/video/uvc/uvcvideo.h
include/linux/usb/video.h
Diffstat (limited to 'drivers/staging/comedi/drivers/quatech_daqp_cs.c')
0 files changed, 0 insertions, 0 deletions