diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus (diff) | |
| parent | HID: uclogic: add proper support for PF1209 (diff) | |
| download | linux-dev-8b66a16f25f819bb1f132f075c5c01a288776cf8.tar.xz linux-dev-8b66a16f25f819bb1f132f075c5c01a288776cf8.zip | |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions