diff options
| author | Linus Torvalds | 2018-06-04 11:28:58 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-04 11:28:58 -0700 |
| commit | 910470e03f343c48500a5619bb14bb8df51c3a72 (patch) | |
| tree | c229822c1e8389160d1c7b161e0ea7a9340ba493 /mm/slub.c | |
| parent | bef82f812c214bf909834bae7d96d806026e3e79 (diff) | |
| parent | 79a3d60300fc28def9b58dc30d86274b47052422 (diff) | |
Merge tag 'chrome-platform-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform
Pull chrome platform updates from Benson Leung:
- further changes from Dmitry related to the removal of platform data
from atmel_mxt_ts and chromeos_laptop.
This time, we have some changes that teach chromeos_laptop how to
supply acpi properties for some input devices so that the peripheral
driver doesn't have to do dmi matching on some Chromebook platforms.
- new Chromebook Tablet switch driver, which is useful for x86
convertible Chromebooks.
- other misc cleanup
* tag 'chrome-platform-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform:
platform/chrome: Use to_cros_ec_dev more broadly
platform/chrome: chromeos_laptop: fix touchpad button mapping on Celes
platform: chrome: Add input dependency for tablet switch driver
platform/chrome: chromeos_laptop - supply properties for ACPI devices
platform/chrome: chromeos_tbmc - add SPDX identifier
platform: chrome: Add Tablet Switch ACPI driver
platform/chrome: cros_ec_lpc: do not try DMI match when ACPI device found
Diffstat (limited to 'mm/slub.c')
0 files changed, 0 insertions, 0 deletions