diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 12:19:07 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 12:19:07 +0400 |
| commit | 047dff63f913c21c5228b94118e7996ab998cdc4 (patch) | |
| tree | ac0351e3242df1bcf69f9ecc66c3f9249318616a /drivers/hid/hid-picolcd.h | |
| parent | 72c16d9a5c303dce928a52a8861fe7a2a25f849a (diff) | |
| parent | b42065f31704686e69002343403f45fff863a120 (diff) | |
| parent | 89759e20d9571e0496c7e12fc4a3ce2a5233f18e (diff) | |
| download | linux-047dff63f913c21c5228b94118e7996ab998cdc4.tar.xz | |
Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus
Conflicts:
drivers/hid/Kconfig