diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-19 16:43:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-19 16:43:10 -0700 |
| commit | b314acaccd7e0d55314d96be4a33b5f50d0b3344 (patch) | |
| tree | 4cd933130cf9e4823da6f4847d08e5d0f91eb770 /net/ipv6/udp_offload.c | |
| parent | 1e744c938da7067c9c639e0a2ae55d4d8fb35b28 (diff) | |
| parent | 09d042a2eb90ee2c86d80c48ad096ae3f5776cef (diff) | |
| download | linux-b314acaccd7e0d55314d96be4a33b5f50d0b3344.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"An update to Synaptics driver that makes it usable with the 2015
lineup from Lenovo"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Revert "Input: synaptics - use dmax in input_mt_assign_slots"
Input: synaptics - remove X250 from the topbuttonpad list
Input: synaptics - remove X1 Carbon 3rd gen from the topbuttonpad list
Input: synaptics - re-route tracksticks buttons on the Lenovo 2015 series
Input: synaptics - remove TOPBUTTONPAD property for Lenovos 2015
Input: synaptics - retrieve the extended capabilities in query $10
Input: synaptics - do not retrieve the board id on old firmwares
Input: synaptics - handle spurious release of trackstick buttons
Input: synaptics - fix middle button on Lenovo 2015 products
Input: synaptics - skip quirks when post-2013 dimensions
Input: synaptics - support min/max board id in min_max_pnpid_table
Input: synaptics - remove obsolete min/max quirk for X240
Input: synaptics - query min dimensions for fw v8.1
Input: synaptics - log queried and quirked dimension values
Input: synaptics - split synaptics_resolution(), query first
Diffstat (limited to 'net/ipv6/udp_offload.c')
0 files changed, 0 insertions, 0 deletions