Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

author Stefan Roese <sr@denx.de>

Thu, 17 Jul 2008 08:41:06 +0000 (10:41 +0200)

committer Stefan Roese <sr@denx.de>

Thu, 17 Jul 2008 08:41:06 +0000 (10:41 +0200)
author Stefan Roese <sr@denx.de>
Thu, 17 Jul 2008 08:41:06 +0000 (10:41 +0200)
committer Stefan Roese <sr@denx.de>
Thu, 17 Jul 2008 08:41:06 +0000 (10:41 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/asm-ppc/processor.h
Simple merge
author	Stefan Roese <sr@denx.de>
	Thu, 17 Jul 2008 08:41:06 +0000 (10:41 +0200)
committer	Stefan Roese <sr@denx.de>
	Thu, 17 Jul 2008 08:41:06 +0000 (10:41 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-ppc/processor.h	patch \|	diff1 \|	diff2 \|	blob \| history