diff options
author | Tom Rini <trini@ti.com> | 2014-11-24 17:01:48 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-24 17:01:48 (GMT) |
commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch) | |
tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde /board/bluewater/snapper9260/MAINTAINERS | |
parent | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff) | |
parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa (diff) | |
download | u-boot-fsl-qoriq-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.xz |
Merge git://git.denx.de/u-boot-dm
Conflicts:
drivers/serial/serial-uclass.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/bluewater/snapper9260/MAINTAINERS')
-rw-r--r-- | board/bluewater/snapper9260/MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/bluewater/snapper9260/MAINTAINERS b/board/bluewater/snapper9260/MAINTAINERS index ff1e997..1f8f4d6 100644 --- a/board/bluewater/snapper9260/MAINTAINERS +++ b/board/bluewater/snapper9260/MAINTAINERS @@ -1,5 +1,5 @@ SNAPPER9260 BOARD -M: Ryan Mallon <ryan@bluewatersys.com> +M: Simon Glass <sjg@chromium.org> S: Maintained F: board/bluewater/snapper9260/ F: include/configs/snapper9260.h |