| commit | 4a247a4119ee932e06e985e0a95a13c3eed4715b | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Mar 20 13:18:05 2012 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Mar 20 13:18:05 2012 +0100 |
| tree | 42b6a7c9edf2f40c7b645a493d63bdb67e5f7100 | |
| parent | 77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51 [diff] | |
| parent | 4d5df5d11e8027c11c1079205757527cbaade62d [diff] |
Merge branch 'upstream' into for-linus Conflicts: drivers/hid/Makefile