diff options
| author | Jiri Kosina | 2013-07-04 15:05:02 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2013-07-04 15:05:02 +0200 |
| commit | 21796b39c9e876a46a353a4a9ff9881766a7c176 (patch) | |
| tree | 119e93184ba04e6cee5798cfd28686100899db1e /include/uapi | |
| parent | 08ec2dcc3527a20c619aca2fb36f800908256bac (diff) | |
| parent | 9d157624035214793c6d06b0512c6ab1a7b39e05 (diff) | |
| parent | b8e0fe31a7c8623741f91bc27f925220341fdf81 (diff) | |
Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus