summaryrefslogtreecommitdiff
path: root/sound/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa')
0 files changed, 0 insertions, 0 deletions
pan='2' class='oid'>1ab2771c56963fec8669ac87c7058c84345365c4 /drivers parent189addce85330208bea50ea7f1483b58822e93cf (diff)parent413d37326700aaf708730b940b04192c36e13ef4 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "A fix for a crash in uinput, and a fix for build errors when HID-RMI is built-in but SERIO is a module" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: synaptics-rmi4 - select 'SERIO' when needed Input: uinput - fix crash when mixing old and new init style
Diffstat (limited to 'drivers')