diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:09:31 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:09:31 +0200 |
| commit | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (patch) | |
| tree | 42f625d04b9fbff4cb93968f18efd91601df15a5 /.mailmap | |
| parent | ef77ad5e67447b3744574c29b97da6677d6d3f18 (diff) | |
| parent | ba4d8abb31def963f49b7c239a8acce57fe1d1cc (diff) | |
Merge branch 'cando' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions