summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-15 18:16:28 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-15 18:16:28 -0600
commit2f39691f31a22e0c6d82573d91306059f8ef920c (patch)
tree6702165407caadb90325baf6042888f10343784a /include/scsi
parentffb29b42271c665cd652dfcaa590895c8a00ac97 (diff)
parent91167e1914673972511617b6f4165bb12c3e0dcf (diff)
downloadblackbird-obmc-linux-2f39691f31a22e0c6d82573d91306059f8ef920c.tar.gz
blackbird-obmc-linux-2f39691f31a22e0c6d82573d91306059f8ef920c.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov: "Second round of updates for the input subsystem. Mostly small fixups to the code merged in the first round (atmel_mxt_ts, wacom) but also a smallish patch to xbox driver to support Xbox One controllers and a patch to better handle Synaptics profile sensors found in Cr-48 Chromebooks that should not affect any other devices" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: edt-ft5x06 - remove superfluous assignment Input: xpad - add support for Xbox One controllers Input: atmel_mxt_ts - fix a few issues reported by Coverity Input: atmel_mxt_ts - split config update a bit Input: atmel_mxt_ts - simplify mxt_initialize a bit Input: joystick - use get_cycles on ARMv8 Input: wacom - fix compiler warning if !CONFIG_PM Input: cap1106 - allow changing key mapping from userspace Input: synaptics - use firmware data for Cr-48 Input: synaptics - properly initialize slots for semi-MT Input: MT - make slot cleanup callable outside mt_sync_frame() Input: atmel_mxt_ts - mXT224 DMA quirk was fixed in firmware v2.0.AA
Diffstat (limited to 'include/scsi')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud