From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 10 Feb 2018 21:50:23 +0000 (-0800)
Subject: Merge tag 'chrome-platform-for-linus-4.16' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.16-rc1~9
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/e9d46f74ecf5eb2c604b32bb43e632d2a5bd44a9

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
---

e9d46f74ecf5eb2c604b32bb43e632d2a5bd44a9