| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Sat Oct 23 22:49:32 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Sat Oct 23 22:49:32 2010 +0200 |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a | |
| parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 [diff] | |
| parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a [diff] |
Merge branch 'uc-logic' into for-linus Conflicts: drivers/hid/hid-ids.h drivers/hid/hid-lg.c drivers/hid/usbhid/hid-quirks.c