diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-31 17:38:59 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-31 17:38:59 (GMT) |
| commit | 026f8f612a137324869b6dbdf1d526d176e1766e (patch) | |
| tree | 2a51af1a1b85f1b130c030167a41b5a8d6c547d8 /include/linux/soundcard.h | |
| parent | e7647027bd90c55cf6dd2ea77fcd3724fb9cc711 (diff) | |
| parent | 5beea882e64121dfe3b33145767d3302afa784d5 (diff) | |
| download | linux-fsl-qoriq-026f8f612a137324869b6dbdf1d526d176e1766e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"A bit later than I would want, but the changes are very minor - a few
new device IDs for new hardware in existing drivers, fix for battery
in Wacom devices not be considered system battery and cause emergency
hibernations, and a couple of other bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ALPS - add support for model found on Dell XT2
Input: wacom - add support for ISDv4 0x10E sensor
Input: wacom - add support for ISDv4 0x10F sensor
Input: wacom - export battery scope
Input: cm109 - convert high volume dev_err() to dev_err_ratelimited()
Input: move name/timer init to input_alloc_dev()
Input: i8042 - i8042_flush fix for a full 8042 buffer
Input: pxa27x_keypad - fix NULL pointer dereference
Diffstat (limited to 'include/linux/soundcard.h')
0 files changed, 0 insertions, 0 deletions