* linux-next: manual merge of the pxa tree with Linus' tree
@ 2009-08-03 1:03 Stephen Rothwell
2009-08-03 13:53 ` Eric Miao
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-08-03 1:03 UTC (permalink / raw)
To: Eric Miao
Cc: linux-next, linux-kernel, Marek Vasut, Joe Perches, Andrew Morton
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 sfr@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: dbaryshkov@gmail.com
-P: Dirk Opfer
-M: dirk@opfer-online.de
+M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+M: Dirk Opfer <dirk@opfer-online.de>
S: Maintained
- ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
-P: Marek Vasut
-M: marek.vasut@gmail.com
+M: Marek Vasut <marek.vasut@gmail.com>
W: http://hackndev.com
S: Maintained
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the pxa tree with Linus' tree
2009-08-03 1:03 linux-next: manual merge of the pxa tree with Linus' tree Stephen Rothwell
@ 2009-08-03 13:53 ` Eric Miao
0 siblings, 0 replies; 2+ messages in thread
From: Eric Miao @ 2009-08-03 13:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Eric Miao, linux-next, linux-kernel, Marek Vasut, Joe Perches,
Andrew Morton
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-08-03 13:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-03 1:03 linux-next: manual merge of the pxa tree with Linus' tree Stephen Rothwell
2009-08-03 13:53 ` Eric Miao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.