Merge branch 'mpc83xx'

author Kumar Gala <galak@kernel.crashing.org>

Fri, 10 Feb 2006 21:42:58 +0000 (15:42 -0600)

committer Kumar Gala <galak@kernel.crashing.org>

Fri, 10 Feb 2006 21:42:58 +0000 (15:42 -0600)
author Kumar Gala <galak@kernel.crashing.org>
Fri, 10 Feb 2006 21:42:58 +0000 (15:42 -0600)
committer Kumar Gala <galak@kernel.crashing.org>
Fri, 10 Feb 2006 21:42:58 +0000 (15:42 -0600)
diff --cc CHANGELOG
Simple merge
diff --cc include/configs/MPC8349ADS.h
Simple merge
author	Kumar Gala <galak@kernel.crashing.org>
	Fri, 10 Feb 2006 21:42:58 +0000 (15:42 -0600)
committer	Kumar Gala <galak@kernel.crashing.org>
	Fri, 10 Feb 2006 21:42:58 +0000 (15:42 -0600)
		1	2
CHANGELOG	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8349ADS.h	patch \|	diff1 \|	diff2 \|	blob \| history