diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-05 11:26:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-05 11:26:11 -0700 |
| commit | f29b909db9df7e7e0bdd0b2c41e3c9d6c7db41a3 (patch) | |
| tree | 7c89754b3e58b246dd357f2b3a6add6f352511ed /init/initramfs.c | |
| parent | 03daa36f089f31002a2d0fb22088d3ebe3e28d98 (diff) | |
| parent | 324ae0958cab5ccdf2851ef0348ba1cb8ad4e34a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: psmouse - cleanup Focaltech code
Input: i8042 - add XMG C504 to keyboard reset table
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions