Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Mon, 27 Jul 2009 11:29:26 +0000 (20:29 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Mon, 27 Jul 2009 11:29:26 +0000 (20:29 +0900)
commit4fb5a225a54cd3a1995245a515f14bcf9d5528af
tree2014f676e0425ecfcd7019aced80912eef995780
parenta621c5dec93680eb37f4670dca65070cef08c0ac
parent94978e19f31d225b4f7d97c4acbac1ecfaeb8f69
Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

drivers/video/Makefile
include/lcd.h

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Makefile
common/env_onenand.c
drivers/video/Makefile
drivers/video/s5pc1xxfb.c
include/lcd.h