diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-17 15:34:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-17 15:34:47 +1000 |
| commit | 0fe273c7c93ac38c09b51b849dd57c5e00a33737 (patch) | |
| tree | 0c9230724bfe05016d647775cf4804a950885863 /drivers/staging/rt2860/rt_main_dev.c | |
| parent | ea003ee19921003026a0f50eef3f84f79e2f0486 (diff) | |
| parent | b4cd4f9825fe56a22ab58ac7ae453f6b2c01a0af (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/media/video/gspca/gspca.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/staging/rt2860/rt_main_dev.c')
0 files changed, 0 insertions, 0 deletions