diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-11 09:55:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-11 09:55:47 -0700 |
| commit | a3ddacbae5abc0a5aabb1e75b655e8cd6dc83888 (patch) | |
| tree | 9b33fb1fdb67080e05b0603c5639bd7b6149b523 /MAINTAINERS | |
| parent | a0188177344c8efdb1467889a0ec148554869e15 (diff) | |
| parent | 3c778a7fcfaa4bb51aefb4f2c7364a5e2c4d0b66 (diff) | |
| download | linux-a3ddacbae5abc0a5aabb1e75b655e8cd6dc83888.tar.gz | |
Merge tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform
Pull chrome platform updates from Benson Leung: "Changes in this pull request are around catching up cros_ec with the internal chromeos-kernel versions of cros_ec, cros_ec_lpc, and cros_ec_lightbar. Also, switching maintainership from olof to bleung" * tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform: platform/chrome : Add myself as Maintainer platform/chrome: cros_ec_lightbar - hide unused PM functions cros_ec: Don't signal wake event for non-wake host events cros_ec: Fix deadlock when EC is not responsive at probe cros_ec: Don't return error when checking command version platform/chrome: cros_ec_lightbar - Avoid I2C xfer to EC during suspend platform/chrome: cros_ec_lightbar - Add userspace lightbar control bit to EC platform/chrome: cros_ec_lightbar - Control of suspend/resume lightbar sequence platform/chrome: cros_ec_lightbar - Add lightbar program feature to sysfs platform/chrome: cros_ec_lpc: Add MKBP events support over ACPI platform/chrome: cros_ec_lpc: Add power management ops platform/chrome: cros_ec_lpc: Add support for GOOG004 ACPI device platform/chrome: cros_ec_lpc: Add support for mec1322 EC platform/chrome: cros_ec_lpc: Add R/W helpers to LPC protocol variants mfd: cros_ec: Add support for dumping panic information cros_ec_debugfs: Pass proper struct sizes to cros_ec_cmd_xfer() mfd: cros_ec: add debugfs, console log file mfd: cros_ec: Add EC console read structures definitions mfd: cros_ec: Add helper for event notifier.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d8eab9322ba2..f6ec1be48609 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3319,9 +3319,10 @@ F: Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt F: drivers/input/touchscreen/chipone_icn8318.c CHROME HARDWARE PLATFORM SUPPORT +M: Benson Leung <bleung@chromium.org> M: Olof Johansson <olof@lixom.net> S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git F: drivers/platform/chrome/ CISCO VIC ETHERNET NIC DRIVER |