Merge branch 'asi1230-upstream-tracking' into asi1230-master

Conflicts:
	board/asi1230/ddr2.h