Merge branch 'next'

author Kim Phillips <[email protected]>

Mon, 25 Aug 2008 22:02:10 +0000 (17:02 -0500)

committer Kim Phillips <[email protected]>

Mon, 25 Aug 2008 22:02:10 +0000 (17:02 -0500)
author Kim Phillips <[email protected]>
Mon, 25 Aug 2008 22:02:10 +0000 (17:02 -0500)
committer Kim Phillips <[email protected]>
Mon, 25 Aug 2008 22:02:10 +0000 (17:02 -0500)
diff --cc common/fdt_support.c
Simple merge
diff --cc include/configs/MPC8315ERDB.h
Simple merge
author	Kim Phillips <[email protected]>
	Mon, 25 Aug 2008 22:02:10 +0000 (17:02 -0500)
committer	Kim Phillips <[email protected]>
	Mon, 25 Aug 2008 22:02:10 +0000 (17:02 -0500)
		1	2
common/fdt_support.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8315ERDB.h	patch \|	diff1 \|	diff2 \|	blob \| history