diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 10:49:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 10:49:37 -0400 |
| commit | 152fcb2784c9305e19e7caee2932b9e32b0a1d41 (patch) | |
| tree | a8fceed3656ea2e7ef6a3c2f5afb450cf7620bdd /crypto/xts.c | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| parent | 4b7d293c64fde133cc2b669d0d7637b8a4c6d62f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Except for the largish change to the ALPS driver adding "Dolphin V1"
support and Wacom getting a new signature of yet another device, the
rest are straightforward driver fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: mms114 - Fix regulator enable and disable paths
Input: ads7864 - check return value of regulator enable
Input: tc3589x-keypad - fix keymap size
Input: wacom - add support for 0x10d
Input: ALPS - update documentation for recent touchpad driver mods
Input: ALPS - add "Dolphin V1" touchpad support
Input: ALPS - remove unused argument to alps_enter_command_mode()
Input: cypress_ps2 - fix trackpadi found in Dell XPS12
Diffstat (limited to 'crypto/xts.c')
0 files changed, 0 insertions, 0 deletions