Merge branch 'master' of ../master into next
authorWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
1  2 
MAINTAINERS
boards.cfg
include/configs/omap4_sdp4430.h

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge