| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 30 Jul 2015 18:03:04 +0000 (11:03 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 30 Jul 2015 18:03:04 +0000 (11:03 -0700) | ||
| commit | dbe08116b87cdc2217f11a78b5b70e29068b7efd | |
| tree | cf1829d864da4661f020645f04e50c11f444e1a6 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 0a552051a467a544135448905cf42e6e78d1a6c0 | commit | diff |
| parent | 3213afb8bf5cf8d8c68a2c2376bf1dda52afae5d | commit | diff |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"The main change is support for keyboards and touchpads found in 2015
editions of Macbooks"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Revert "Input: zforce - don't overwrite the stack"
Input: bcm5974 - add support for the 2015 Macbook Pro
HID: apple: Add support for the 2015 Macbook Pro
Input: bcm5974 - prepare for a new trackpad generation
Input: synaptics - dump ext10 capabilities as well
Pull input fixes from Dmitry Torokhov:
"The main change is support for keyboards and touchpads found in 2015
editions of Macbooks"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Revert "Input: zforce - don't overwrite the stack"
Input: bcm5974 - add support for the 2015 Macbook Pro
HID: apple: Add support for the 2015 Macbook Pro
Input: bcm5974 - prepare for a new trackpad generation
Input: synaptics - dump ext10 capabilities as well
| drivers/hid/hid-core.c | diff1 | | diff2 | | blob | history |
| drivers/hid/hid-ids.h | diff1 | | diff2 | | blob | history |