linux-next: manual merge of the pxa tree with Linus' tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
coalesce name and email address lines") from Linus' tree and commit
4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
support") from the pxa tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au

diff --cc MAINTAINERS
index 1677158,642cd9a..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -705,12 -803,15 +705,12 @@@ W: http://wiki.openmoko.org/wiki/Neo_Fr
S: Supported

ARM/TOSA MACHINE SUPPORT
-P: Dmitry Eremin-Solenikov
-M: dbary...@gmail.com
-P: Dirk Opfer
-M: di...@opfer-online.de
+M: Dmitry Eremin-Solenikov <dbary...@gmail.com>
+M: Dirk Opfer <di...@opfer-online.de>
S: Maintained

- ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
-P: Marek Vasut
-M: marek...@gmail.com
+M: Marek Vasut <marek...@gmail.com>
W: http://hackndev.com
S: Maintained

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Eric Miao]

Stephen Rothwell wrote:
> Hi Eric,
>
> Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
> between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
> coalesce name and email address lines") from Linus' tree and commit
> 4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
> support") from the pxa tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Stephen,

Thanks for the fix.