| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue May 22 11:32:31 2012 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue May 22 11:32:31 2012 +0200 |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e [diff] | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 [diff] |
Merge branch 'upstream' into for-linus Conflicts: drivers/hid/hid-core.c