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                    sfr@xxxxxxxxxxxxxxxx

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@xxxxxxxxx
 -P:	Dirk Opfer
 -M:	dirk@xxxxxxxxxxxxxxx
 +M:	Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
 +M:	Dirk Opfer <dirk@xxxxxxxxxxxxxxx>
  S:	Maintained
  
- ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 -P:	Marek Vasut
 -M:	marek.vasut@xxxxxxxxx
 +M:	Marek Vasut <marek.vasut@xxxxxxxxx>
  W:	http://hackndev.com
  S:	Maintained
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/