| commit | af5666e0f76023d9c296016024297903a4c83108 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Jun 04 13:09:01 2014 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Jun 04 13:09:01 2014 +0200 |
| tree | 9397e7a41dd3eb0c0e14a6407a8e8f12abed4fc5 | |
| parent | 1b15d2e5b8077670b1e6a33250a0d9577efff4a5 [diff] | |
| parent | 368c96640d10a145da5f258f2d2833668d4f3629 [diff] |
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus Conflicts: drivers/hid/hid-sensor-hub.c