diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-31 13:59:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-31 13:59:10 -0800 |
| commit | 283725af0bd2a4a8600bbe5edeb9d7c72780d3a2 (patch) | |
| tree | 9bf719df40980bf7eff7429e9e1db60e803d1698 /net/netfilter | |
| parent | f1774f46d49f806614d81854321ee9e5138135e5 (diff) | |
| parent | 05e0be7c900797e9164976a6014d534ce3035909 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"A fix for a crash in the wm97xx driver and synaptics-rmi4 will stop
throwing erroneous warnings."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - fix reversed conditions in enable/disable_irq_wake
Input: wm97xx - make missing platform data non-fatal
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions