diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-11-16 00:04:57 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-11-16 00:04:57 +0100 |
| commit | 7f9cc24a805ce444e082c01f9818f2d3a25ef268 (patch) | |
| tree | 7ab6d5e2fd22c0cf626524e0f61b977c0ea3ca16 /drivers/hid/usbhid | |
| parent | f1a4914bd04911fbeaee23445112adae8977144a (diff) | |
| parent | e1b8ad8e78301b98363feb0b8c1db199e4877cb2 (diff) | |
| parent | 1859762ed538477fc80ada926571d12dc4c9c062 (diff) | |
| parent | e02aea9132cf40e8ef111588b06a93956fe77545 (diff) | |
| parent | e078809df5611600965f4d3420c3256260fc3e3d (diff) | |
| parent | e17f5d7667c5414b8f12a93ef14aae0824bd2beb (diff) | |
| parent | 08072dde333c2f09114a01b0bd32be52ecce195b (diff) | |
Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid', 'for-3.13/logitech', 'for-3.13/multitouch', 'for-3.13/roccat', 'for-3.13/upstream' and 'for-3.13/wiimote' into for-linus