diff --git a/[refs] b/[refs] index 1499fcf687dc..33e73fe5797e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a09f8916c20e4799b214349df371ff5d164778d +refs/heads/master: a6bb4bab1cda4793cfa78c995042ecdf91401329 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 799f9d818d18..78ff730feaaf 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3534,6 +3534,15 @@ M: linux@arm.linux.org.uk L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +PXA168 SUPPORT +P: Eric Miao +M: eric.miao@marvell.com +P: Jason Chagas +M: jason.chagas@marvell.com +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +T: git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git +S: Supported + PXA MMCI DRIVER S: Orphan