Merge branch 'denx-coldfire' into coldfire-aug2007

author John Rigby <jrigby@freescale.com>

Thu, 16 Aug 2007 23:40:03 +0000 (17:40 -0600)

committer John Rigby <jrigby@freescale.com>

Thu, 16 Aug 2007 23:40:03 +0000 (17:40 -0600)
author John Rigby <jrigby@freescale.com>
Thu, 16 Aug 2007 23:40:03 +0000 (17:40 -0600)
committer John Rigby <jrigby@freescale.com>
Thu, 16 Aug 2007 23:40:03 +0000 (17:40 -0600)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	John Rigby <jrigby@freescale.com>
	Thu, 16 Aug 2007 23:40:03 +0000 (17:40 -0600)
committer	John Rigby <jrigby@freescale.com>
	Thu, 16 Aug 2007 23:40:03 +0000 (17:40 -0600)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history