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

author Wolfgang Denk <wd@denx.de>

Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)

committer Wolfgang Denk <wd@denx.de>

Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
author Wolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
committer Wolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/i2c/Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Sun, 1 Feb 2009 20:38:07 +0000 (21:38 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history