diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:19:07 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:19:07 +0200 |
| commit | 047dff63f913c21c5228b94118e7996ab998cdc4 (patch) | |
| tree | ac0351e3242df1bcf69f9ecc66c3f9249318616a /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus (diff) | |
| parent | HID: roccat: added media key support for Kone (diff) | |
| parent | HID: Add PID for Japanese version of NE4K keyboard (diff) | |
| download | linux-047dff63f913c21c5228b94118e7996ab998cdc4.tar.gz linux-047dff63f913c21c5228b94118e7996ab998cdc4.zip | |
Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus
Conflicts:
drivers/hid/Kconfig