diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-12 14:56:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-12 14:56:53 +1000 |
| commit | 353debb9e6549b2ab63ca2131d837bb4cfcc44a7 (patch) | |
| tree | 920501e1dc313ae0e42f45f849c8598d57c0c977 /drivers/staging/vt6655/srom.c | |
| parent | 921e9ad03faf16fb2cca5059cb126fd74afb6ec5 (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/vt6655/srom.c')
0 files changed, 0 insertions, 0 deletions