Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Tue, 6 Oct 2009 10:37:37 +0000 (19:37 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Tue, 6 Oct 2009 10:37:37 +0000 (19:37 +0900)
commit7b5f7dc1c13c1f69605810a071cdc545dd0ded89
treeb1cfb4565877217ead9bb5d9b40f140107ef980c
parenta938861369d12aaaede52620f2215ee716f74d30
parent99dbd4efd6d5ecc37d7e8f28b20d9be8c83055c7
Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

Makefile
onenand_ipl/onenand_ipl.h
onenand_ipl/onenand_read.c

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Makefile
onenand_ipl/onenand_ipl.h
onenand_ipl/onenand_read.c