diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:29:35 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:29:35 +0200 |
| commit | 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd (patch) | |
| tree | 1f85aa8bd902aae76beb1c9deb20557a2e71fe9c /drivers/hid/hid-a4tech.c | |
| parent | 9929ffed889b4861b52ba648a44fa4add945c4d1 (diff) | |
| parent | 7d3d42a79519df4cd62c3aa5d9ae2d77ebbf8fab (diff) | |
Merge branch 'acrux' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-a4tech.c')
0 files changed, 0 insertions, 0 deletions