Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39fbc762 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical 

* pxa/fixes-non-critical:
  MAINTAINERS: update pxa and mmp
  ARM: pxa: Include linux/export.h in balloon3.c
parents bcdbbe3d 3f640c61

MAINTAINERS

+7 −15
Original line number Diff line number Diff line
@@ -5302,7 +5302,10 @@ F: drivers/media/video/pvrusb2/ 
PXA2xx/PXA3xx SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

M:	Russell King <linux@arm.linux.org.uk>

M:	Haojian Zhuang <haojian.zhuang@marvell.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://github.com/hzhuang1/linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

S:	Maintained

F:	arch/arm/mach-pxa/

F:	drivers/pcmcia/pxa2xx*
@@ -5312,25 +5315,14 @@ F: include/sound/pxa2xx-lib.h 
F:	sound/arm/pxa*

F:	sound/soc/pxa



PXA168 SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

M:	Jason Chagas <jason.chagas@marvell.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Maintained



PXA910 SUPPORT

MMP SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

S:	Maintained



MMP2 SUPPORT (aka ARMADA610)

M:	Haojian Zhuang <haojian.zhuang@marvell.com>

M:	Eric Miao <eric.y.miao@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git

T:	git git://github.com/hzhuang1/linux.git

T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git

S:	Maintained

F:	arch/arm/mach-mmp/



PXA MMCI DRIVER

S:	Orphan

arch/arm/mach-pxa/balloon3.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 *  published by the Free Software Foundation.

 */



#include <linux/export.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>