Merge branch 'master' of ../master into next

author Wolfgang Denk <wd@denx.de>

Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)

committer Wolfgang Denk <wd@denx.de>

Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
author Wolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
committer Wolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc include/configs/omap4_sdp4430.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/omap4_sdp4430.h	patch \|	diff1 \|	diff2 \|	blob \| history