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

author Wolfgang Denk <wd@denx.de>

Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)

committer Wolfgang Denk <wd@denx.de>

Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)
author Wolfgang Denk <wd@denx.de>
Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)
committer Wolfgang Denk <wd@denx.de>
Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/configs/qong.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/qong.h	patch \|	diff1 \|	diff2 \|	blob \| history