diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-20 15:22:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-20 15:22:45 +1000 |
| commit | a186bcf9587b21db51f27789ae5f9468035ec9b7 (patch) | |
| tree | 7e8cf4c692eb11dcffbd5c59dade54b757ee4c6c /drivers/staging/iio/light/tsl2563.c | |
| parent | 3c85fc2a110f8ef2b057b678f53c1b6a9662e3d5 (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/iio/light/tsl2563.c')
0 files changed, 0 insertions, 0 deletions