Merge remote-tracking branch 'mpc83xx/next'

author Kim Phillips <kim.phillips@freescale.com>

Thu, 17 Jan 2013 00:34:09 +0000 (18:34 -0600)

committer Kim Phillips <kim.phillips@freescale.com>

Thu, 17 Jan 2013 00:34:09 +0000 (18:34 -0600)
author Kim Phillips <kim.phillips@freescale.com>
Thu, 17 Jan 2013 00:34:09 +0000 (18:34 -0600)
committer Kim Phillips <kim.phillips@freescale.com>
Thu, 17 Jan 2013 00:34:09 +0000 (18:34 -0600)
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
author	Kim Phillips <kim.phillips@freescale.com>
	Thu, 17 Jan 2013 00:34:09 +0000 (18:34 -0600)
committer	Kim Phillips <kim.phillips@freescale.com>
	Thu, 17 Jan 2013 00:34:09 +0000 (18:34 -0600)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history