| commit | e6dfb04360bb265c2e931316369c877b3bb7159c | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Thu Aug 01 00:48:52 2013 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Thu Aug 01 00:48:52 2013 +0200 |
| tree | cb8b6ee54191e4a2478ea92539ecc924cdcb8321 | |
| parent | 8e552e535948fe8612d36a7beaf19519140bc285 [diff] | |
| parent | 407a2c2a4d85100c8c67953e4bac2f4a6c942335 [diff] |
Merge branches 'for-3.11/upstream-fixes' and 'for-3.11/logitech-enumeration-fix' into for-linus