| commit | 6cf8c85f8bc320ca0273c5261cc13ee1491d7b92 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Apr 01 19:06:41 2014 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Apr 01 19:06:41 2014 +0200 |
| tree | 418b338bcb2014768ede10e73179c7afbaf1736d | |
| parent | ded75664d1a7d74c1976da0969ddb31ad9839d4c [diff] | |
| parent | 34e75dca4e6313249c9a2faa8effeddce89b91ac [diff] |
Merge branch 'for-3.15/microsoft' into for-linus Conflicts: drivers/hid/hid-core.c