diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 14:52:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 14:52:27 +1000 |
| commit | 8a95ccb08f38db0371634dbf1e34a5094ff00c6e (patch) | |
| tree | be4a73d153be3ea58ce8f32dae3c17a26d4998e5 /drivers/staging/vt6656/firmware.c | |
| parent | c7d4471997fcbf016d95b37744e68ad015e7e1ad (diff) | |
| parent | 49fb5166b4a66d7a2dc22b4c36f5661123a39d71 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/staging/vt6656/firmware.c')
0 files changed, 0 insertions, 0 deletions