diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:12:44 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 10:12:44 +0200 |
| commit | 4f5a81042909fed6977881f22c024aa3582cfcca (patch) | |
| tree | e4988527cfb63d13a40fe235c8aa399a4931c049 /drivers/hid/hid-logitech-dj.c | |
| parent | 9a4a5574ce427c364d81746fc7fb82d86b5f1a7e (diff) | |
| parent | 2353f2bea307390e015493118e425152b8a5a431 (diff) | |
| parent | 7c4d577367fb710ea74a56955c5e3546fe5dd7ac (diff) | |
| parent | d991938a807a63c58c9c0fa6cd05cd2490aa6993 (diff) | |
Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver-transport-cleanups', 'for-3.10/i2c-hid' and 'for-3.10/logitech' into for-linus