Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

2013-08-13 09:14:02 -04:00
parent 67cafc0861 3aab0cd852
commit b98d934128
86 changed files with 4027 additions and 814 deletions
--- a/8
+++ b/8
@@ -472,6 +472,10 @@ Ira W. Snyder <iws@ovro.caltech.edu>

 	P2020COME	P2020

+York Sun <yorksun@freescale.com>
+
+	T4240EMU	T4240
+
 Timur Tabi <timur@freescale.com>

 	MPC8349E-mITX	MPC8349
@@ -539,6 +543,10 @@ Detlev Zundel <dzu@denx.de>

 	inka4x0		MPC5200

+Po Liu <po.liu@freescale.com>
+
+	C29XPCIE	C29X
+
 -------------------------------------------------------------------------

 Unknown / orphaned boards: