Merge branch 'master' of http://git.denx.de/u-boot JA08_20100122
authorKyungmin Park <kyungmin.park@samsung.com>
Fri, 22 Jan 2010 07:04:52 +0000 (16:04 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Fri, 22 Jan 2010 07:04:52 +0000 (16:04 +0900)
commit871ae843f5a95f5dff475718b68cd8edce62afbc
treecfd238a9b6ae20e7e8b8e3deda9413e14860469d
parent08309eafbfda2664e3467aa300ee77b4af1138b1
parent57ae8a5cced612088104303777e71a3dc89c00ef
Merge branch 'master' of http://git.denx.de/u-boot

Conflicts:

lib_generic/Makefile
lib_generic/net_utils.c

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