tree 4bc9e1362c3090bb6d2df71109228ca61b8d00ce
parent 5a56af3b522ba47fb33a3fee84d23bf1e5429654
parent 5dc210dec5bace98a50b6ba905347890091a9bb0
author Andy Fleming <afleming@freescale.com> 1186125803 -0500
committer Andrew Fleming-AFLEMING <afleming@freescale.com> 1186125803 -0500

Merge branch 'testing' into working

Conflicts:

	CHANGELOG
	fs/fat/fat.c
	include/configs/MPC8560ADS.h
	include/configs/pcs440ep.h
	net/eth.c