Merge branch 'master' of git://www.denx.de/git/u-boot-arm

author Wolfgang Denk <[email protected]>

Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)

committer Wolfgang Denk <[email protected]>

Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
author Wolfgang Denk <[email protected]>
Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
committer Wolfgang Denk <[email protected]>
Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <[email protected]>
	Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
committer	Wolfgang Denk <[email protected]>
	Wed, 9 Jan 2008 10:30:15 +0000 (11:30 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history