diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:18:05 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:18:05 +0100 |
commit | 4a247a4119ee932e06e985e0a95a13c3eed4715b (patch) | |
tree | 42b6a7c9edf2f40c7b645a493d63bdb67e5f7100 /drivers/lguest | |
parent | Merge branches 'roccat' and 'wacom' into for-linus (diff) | |
parent | HID: multitouch: add PID for Fructel product (diff) | |
download | linux-4a247a4119ee932e06e985e0a95a13c3eed4715b.tar.xz linux-4a247a4119ee932e06e985e0a95a13c3eed4715b.zip |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/Makefile
Diffstat (limited to 'drivers/lguest')
0 files changed, 0 insertions, 0 deletions