diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:00 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:00 -0500 |
commit | 2f977dd7e8e31b85f8d5942e25387540ed4fa15e (patch) | |
tree | 5a8be14e739ef0b301d523e9b963c8fe1019f32a /MAINTAINERS | |
parent | 11ddeea91a3b22bd4d4647c732bed32cb6d5112c (diff) | |
parent | f5f487b2562e289ab896387ca5e067acfd9fb077 (diff) |
Merge remote-tracking branch 'pmaydell/omap-for-upstream' into staging
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d034ce4b5a..2b4c5d727e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -360,6 +360,11 @@ M: Kevin Wolf <kwolf@redhat.com> S: Odd Fixes F: hw/ide/ +OMAP +M: Peter Maydell <peter.maydell@linaro.org> +S: Maintained +F: hw/omap* + PCI M: Michael S. Tsirkin <mst@redhat.com> S: Supported |