Merge branch 'next'

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

Fri, 23 Jan 2009 23:48:24 +0000 (17:48 -0600)

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

Fri, 23 Jan 2009 23:48:24 +0000 (17:48 -0600)
author Kim Phillips <kim.phillips@freescale.com>
Fri, 23 Jan 2009 23:48:24 +0000 (17:48 -0600)
committer Kim Phillips <kim.phillips@freescale.com>
Fri, 23 Jan 2009 23:48:24 +0000 (17:48 -0600)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/configs/MPC8315ERDB.h
Simple merge
diff --cc include/configs/MPC837XEMDS.h
Simple merge
author	Kim Phillips <kim.phillips@freescale.com>
	Fri, 23 Jan 2009 23:48:24 +0000 (17:48 -0600)
committer	Kim Phillips <kim.phillips@freescale.com>
	Fri, 23 Jan 2009 23:48:24 +0000 (17:48 -0600)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8315ERDB.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/MPC837XEMDS.h	patch \|	diff1 \|	diff2 \|	blob \| history