Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2

author Stefan Roese <sr@denx.de>

Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)

committer Stefan Roese <sr@denx.de>

Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)
author Stefan Roese <sr@denx.de>
Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)
committer Stefan Roese <sr@denx.de>
Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/asm-ppc/mmu.h
Simple merge
diff --cc include/common.h
Simple merge
author	Stefan Roese <sr@denx.de>
	Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)
committer	Stefan Roese <sr@denx.de>
	Thu, 27 Dec 2007 18:37:26 +0000 (19:37 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/mmu.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history