Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile
drivers/i2c/Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Simple merge