summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/Kconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-14 10:06:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-14 10:06:45 +0200
commit3c94280456d9925a795e5d423330acac4b223823 (patch)
treee80de999e627e7e19e0923cfd193263e9b1cef3a /drivers/net/can/Kconfig
parentMerge branches 'acpica' and 'acpi-property' (diff)
parentplatform/x86: Add ACPI i2c-multi-instantiate pseudo driver (diff)
parentACPI: bus: Fix a pointer coding style issue (diff)
parentACPI / EC: Add another entry for Thinkpad X1 Carbon 6th (diff)
parentarm64 / ACPI: clean the additional checks before calling ghes_notify_sea() (diff)
downloadlinux-3c94280456d9925a795e5d423330acac4b223823.tar.xz
linux-3c94280456d9925a795e5d423330acac4b223823.zip
Merge branches 'acpi-x86', 'acpi-bus', 'acpi-ec' and 'acpi-apei'
Merge ACPI x86-specific changes, core updates, EC driver updates and APEI support updates for 4.19. These add a special platform driver for handling multiple I2C devices hooked up to the same device object in the ACPI tables, add some new quirks and remove one that is not needed any more. * acpi-x86: platform/x86: Add ACPI i2c-multi-instantiate pseudo driver ACPI / x86: utils: Remove status workaround from acpi_device_always_present() ACPI / x86: enable touchscreen on Dell Venue Pro 7139 * acpi-bus: ACPI: bus: Fix a pointer coding style issue Revert "ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530" * acpi-ec: ACPI / EC: Add another entry for Thinkpad X1 Carbon 6th ACPI / EC: Use ec_no_wakeup on ThinkPad X1 Yoga 3rd * acpi-apei: arm64 / ACPI: clean the additional checks before calling ghes_notify_sea()