Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Wed, 22 Jul 2009 08:10:18 +0000 (17:10 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Wed, 22 Jul 2009 08:10:18 +0000 (17:10 +0900)
1  2 
.gitignore
Makefile

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge