summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-03-28 12:39:43 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-03-28 12:39:43 +0000
commita04d91c701251a9b32b7364ddb48029ba024cb75 (patch)
tree3e414334d35b041f47e70a1d37277471b5a0cf99
parent12f067cc14b90aef60b2b7d03e1df74cc50a0459 (diff)
parentc3c962c12cca0ebba6ef12f6474618eb38aed9a3 (diff)
downloadfocaccia-qemu-a04d91c701251a9b32b7364ddb48029ba024cb75.tar.gz
focaccia-qemu-a04d91c701251a9b32b7364ddb48029ba024cb75.zip
Merge remote-tracking branch 'remotes/alistair/tags/pull-device-tree-20190327' into staging
Device Tree Pull Request for 4.0

A single patch updating the MAINTAINERS file for 4.0.

# gpg: Signature made Wed 27 Mar 2019 17:02:00 GMT
# gpg:                using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
# gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full]
# Primary key fingerprint: F6C4 AC46 D493 4868 D3B8  CE8F 21E1 0D29 DF97 7054

* remotes/alistair/tags/pull-device-tree-20190327:
  MAINTAINERS: Update the device tree maintainers

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 85d7d764e5..c2ad5062f6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1813,7 +1813,8 @@ F: qom/cpu.c
 F: include/qom/cpu.h
 
 Device Tree
-M: Alexander Graf <agraf@suse.de>
+M: Alistair Francis <alistair.francis@wdc.com>
+R: David Gibson <david@gibson.dropbear.id.au>
 S: Maintained
 F: device_tree.c
 F: include/sysemu/device_tree.h