Merge commit 'wd/master'

author Jon Loeliger <jdl@freescale.com>

Mon, 10 Nov 2008 16:04:51 +0000 (10:04 -0600)

committer Jon Loeliger <jdl@freescale.com>

Mon, 10 Nov 2008 16:04:51 +0000 (10:04 -0600)
author Jon Loeliger <jdl@freescale.com>
Mon, 10 Nov 2008 16:04:51 +0000 (10:04 -0600)
committer Jon Loeliger <jdl@freescale.com>
Mon, 10 Nov 2008 16:04:51 +0000 (10:04 -0600)
diff --cc board/freescale/mpc8610hpcd/mpc8610hpcd.c
Simple merge
diff --cc board/freescale/mpc8641hpcn/mpc8641hpcn.c
Simple merge
author	Jon Loeliger <jdl@freescale.com>
	Mon, 10 Nov 2008 16:04:51 +0000 (10:04 -0600)
committer	Jon Loeliger <jdl@freescale.com>
	Mon, 10 Nov 2008 16:04:51 +0000 (10:04 -0600)
		1	2
board/freescale/mpc8610hpcd/mpc8610hpcd.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/freescale/mpc8641hpcn/mpc8641hpcn.c	patch \|	diff1 \|	diff2 \|	blob \| history