diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:26:15 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:26:15 +0200 |
| commit | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (patch) | |
| tree | 326d5f84b13938a12fb27468ef73db4faf43a44e /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Linux 2.6.35-rc5 (diff) | |
| parent | HID: ignore digitizer usage Undefined (0x00) (diff) | |
| download | linux-dev-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.xz linux-dev-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions