diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-07 10:44:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-07 10:44:05 +0100 |
| commit | 566b3ad99dbbff5418653fd9a572d85dbce9a4b0 (patch) | |
| tree | 224d8a0857e9309c5f988a718340efa1530fd779 /MAINTAINERS | |
| parent | c79f46a282390e0f5b306007bf7b11a46d529538 (diff) | |
| parent | fbdd256fe701a680f6eab3fa93dbab1942ab6a9f (diff) | |
Merge branch 'acpica' into linux-next
* acpica:
ACPICA: Update the list of maintainers
ACPICA: Update version to 20191213
ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator
ACPICA: acpisrc: add unix line ending support for non-windows build
ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1
ACPICA: debugger: fix spelling mistake "adress" -> "address"
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8982c6e013b3..1dd129cb691c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -345,7 +345,7 @@ F: drivers/acpi/apei/ ACPI COMPONENT ARCHITECTURE (ACPICA) M: Robert Moore <robert.moore@intel.com> -M: Erik Schmauss <erik.schmauss@intel.com> +M: Erik Kaneda <erik.kaneda@intel.com> M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> L: linux-acpi@vger.kernel.org L: devel@acpica.org |