| commit | 188933ac139a6f8ab06cad369bd0200af947b00d | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Mon Mar 23 09:18:27 2015 -0700 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Mon Mar 23 09:18:27 2015 -0700 |
| tree | c4c107528fcf6b82e32a93b0596e13eea7aa9385 | |
| parent | 4ed0e032c3cf27c6fabc154164d003c4e0ac4654 [diff] | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 [diff] |
Merge tag 'v4.0-rc5' into next Merge with the latest upstream to synchronize Synaptics changes and bring in new infrastructure pieces. Conflicts: drivers/input/mouse/synaptics.c