| commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Mon Oct 01 14:37:51 2012 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Mon Oct 01 14:37:51 2012 +0200 |
| tree | f245dd77a3dede97a80f8369d984334b56220752 | |
| parent | fa2bd30159499f441125495ba8d9d57f646ea42a [diff] | |
| parent | 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 [diff] |
Merge branch 'upstream' into for-linus Conflicts: drivers/hid/usbhid/hid-quirks.c