diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-08-06 11:09:53 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-08-06 11:09:53 +0200 |
| commit | cf6f3976045468049038cfc45586b8b16c33dd05 (patch) | |
| tree | 10ae0416c91e41343fe172046790b0253c5c88b0 /drivers/hid | |
| parent | 46df9dedabc1541f9c45f94ecd2c3c7ab0c3bf23 (diff) | |
| parent | b9029345ed6483fcadadc4834b44a5656dd56d70 (diff) | |
| parent | f20f6eccffcbc0d46d7b70624fea75ac5c970c47 (diff) | |
| parent | f1210455e78a610c7b316389b31c162c371d888c (diff) | |
| parent | 109571cf3ec78a39477eedd6b11927f52cbcb1e8 (diff) | |
| parent | f3d4ff0e04cc4450bdc7a4140020913b1280d205 (diff) | |
| parent | e19ff99f256aeeff6c07b373e01883b72e049552 (diff) | |
| parent | 5607c89a115563104e1eea8d597282c799e75c99 (diff) | |
Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17/hyperv', 'for-3.17/i2c', 'for-3.17/lenovo', 'for-3.17/rmi' and 'for-3.17/sony' into for-linus