diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-10 22:50:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-10 22:50:23 +0100 |
| commit | e9d46f74ecf5eb2c604b32bb43e632d2a5bd44a9 (patch) | |
| tree | 2754cef2252b2ebe82e86136d90f0669bc24a9aa /security/keys/Makefile | |
| parent | Merge tag 'kvm-4.16-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | platform/chrome: Use proper protocol transfer function (diff) | |
| download | linux-e9d46f74ecf5eb2c604b32bb43e632d2a5bd44a9.tar.xz linux-e9d46f74ecf5eb2c604b32bb43e632d2a5bd44a9.zip | |
Merge tag 'chrome-platform-for-linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform
Pull chrome platform updates from Benson Leung:
- move cros_ec_dev to drivers/mfd
- other small maintenance fixes
[ The cros_ec_dev movement came in earlier through the MFD tree - Linus ]
* tag 'chrome-platform-for-linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform:
platform/chrome: Use proper protocol transfer function
platform/chrome: cros_ec_lpc: Add support for Google Glimmer
platform/chrome: cros_ec_lpc: Register the driver if ACPI entry is missing.
platform/chrome: cros_ec_lpc: remove redundant pointer request
cros_ec: fix nul-termination for firmware build info
platform/chrome: chromeos_laptop: make chromeos_laptop const
Diffstat (limited to 'security/keys/Makefile')
0 files changed, 0 insertions, 0 deletions