| commit | c062c4d1de57789bf15f7641a24c429eeb8a1c6a | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Jul 24 13:40:06 2012 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Jul 24 13:40:06 2012 +0200 |
| tree | dfd376034ea8458689c937dafa5e318892af82af | |
| parent | 929bd380b7aec9f9553b6509af86cdba25e334b8 [diff] | |
| parent | adefb69b1b94df29ea2df05cd838c0e032b2c473 [diff] |
Merge branch 'uhid' into for-linus Conflicts: drivers/hid/Kconfig