Merge branch 'master' of http://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Thu, 14 Jan 2010 09:46:34 +0000 (18:46 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Thu, 14 Jan 2010 09:46:34 +0000 (18:46 +0900)
commit4fc0afaa158332bb71c5e216dac56c383a7bc429
tree456c700d8651cb23c81a53546002325e21a8ce5f
parentbfc513739bd9342dbddcf105a9f8bba379b8fcd1
parent2ff6922280025c1315c53fa2eb4ab33f0c9591de
Merge branch 'master' of http://git.denx.de/u-boot

Conflicts:

common/env_onenand.c

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Makefile
common/env_onenand.c