| commit | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed May 19 14:09:31 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed May 19 14:09:31 2010 +0200 |
| tree | 42f625d04b9fbff4cb93968f18efd91601df15a5 | |
| parent | ef77ad5e67447b3744574c29b97da6677d6d3f18 [diff] | |
| parent | ba4d8abb31def963f49b7c239a8acce57fe1d1cc [diff] |
Merge branch 'cando' into for-linus Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h