| commit | 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed May 19 14:26:44 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed May 19 14:26:44 2010 +0200 |
| tree | f05d0a426959ee01ce74c1f4733076d3b0ee4c8d | |
| parent | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 [diff] | |
| parent | c872b0fccc6e086beea0a7b3b4123b7d0e75a868 [diff] |
Merge branch 'egalax' into for-linus Conflicts: drivers/hid/hid-ids.h