diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-13 13:36:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-13 13:36:48 +1000 |
| commit | b05cf6f03073a7411127da92363330a19fc57d49 (patch) | |
| tree | de6363036d29c227e50e2d6a531f9b8506d9817c /drivers/staging/vt6656/power.c | |
| parent | 77360ba462acd7f0dce9541179649a545751ce92 (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/vt6656/power.c')
0 files changed, 0 insertions, 0 deletions