| commit | b3aec7b686329e6bb65aa08c7f9458f7fd512f06 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Oct 25 09:59:04 2011 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Oct 25 09:59:04 2011 +0200 |
| tree | 67ae55567b5747f32ddd76dd63621bd2ca756a88 | |
| parent | f6f12427844516bc8e9cf84f43aca7bbbaa48157 [diff] | |
| parent | 1bcc20675a1ac1ba47eaa201e02a89b0508e17b2 [diff] |
Merge branch 'upstream' into for-linus Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h