diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-03 14:13:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-03 14:13:08 +1000 |
| commit | 7f1e428f9030b9703f27ef571609d8e17a06e323 (patch) | |
| tree | 5cb1666094adae86dfd67a81b27ea1699a516caf /drivers/staging/vt6656/power.h | |
| parent | 6e548bd87de5edbc157b4877b34c0f04bab071e0 (diff) | |
| parent | 1c1b78bee1a94f98deeb9c24b21c4812e191646c (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/power.h')
0 files changed, 0 insertions, 0 deletions