aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-quanta.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-02 17:10:39 -0500
committerJiri Kosina <jkosina@suse.cz>2010-02-02 17:10:39 -0500
commite1a0bdd8022317e98650e70850de73eccfcde5ad (patch)
tree462f63307118b95c8cbacee6954e4d09ee85b8d1 /drivers/hid/hid-quanta.c
parent8127f4e883666c9960cfa89cffd36313748f8bab (diff)
parent1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff)
Merge branch 'master' into upstream
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-quanta.c')
0 files changed, 0 insertions, 0 deletions