diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 14:53:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 14:53:29 +1000 |
| commit | 9f28e837bf1a78db2497b61cb2e78f39be2fe2b3 (patch) | |
| tree | 5edc23be87dbb25166edc03ac9a082fdc8cb2c84 /drivers/staging/vt6655/mac.h | |
| parent | 7e0ca02f6b8074373eab418196a25222bd891f6c (diff) | |
| parent | ddf668eba80c9eeffea7a70d22badd958edfbc7b (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/media/video/uvc/uvcvideo.h
include/linux/usb/video.h
Diffstat (limited to 'drivers/staging/vt6655/mac.h')
0 files changed, 0 insertions, 0 deletions