diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-02-09 11:17:45 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-02-09 11:17:45 +0100 |
| commit | 988b7fb0bfc215476c3a0a623b442cd0e29ce4c0 (patch) | |
| tree | 00c36319fbb20886ea6c8bf79d118c25af2f24e7 /drivers/hid/hid-ids.h | |
| parent | a8c8316b11594e616df641b4b19ec9da732f93df (diff) | |
| parent | cbd366bea2b8513bc0fc1c9e8832cb0ab221d6d5 (diff) | |
| parent | 52cd7785f3cdd2724f4efb5b21dbc75d6f9ccef4 (diff) | |
| parent | 94eefa27132358434735060c6bbdf61c669bb0ab (diff) | |
| parent | 2f1cec3250e38609bf9252db52dbbe61603c04a7 (diff) | |
| parent | e9287099ba6539bccb20cd791269186f3ae28b85 (diff) | |
| parent | afd700d933963d07391e3e3dfbfbc05e905960ef (diff) | |
| parent | 500d4160abe9a2e88b12e319c13ae3ebd1e18108 (diff) | |
Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for-3.20/lenovo', 'for-3.20/logitech', 'for-3.20/rmi', 'for-3.20/upstream' and 'for-3.20/wacom' into for-linus