]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://www.denx.de/git/u-boot
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
committerShinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Fri, 18 Jan 2008 13:48:06 +0000 (22:48 +0900)
1  2 
MAINTAINERS
MAKEALL
Makefile

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