Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Mon, 7 Dec 2009 21:47:17 +0000 (22:47 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 7 Dec 2009 21:47:17 +0000 (22:47 +0100)
commit206c00f26f56af02686cb69bfe5c75e979063171
tree4e637df34f87762a2e70649e88f52ac973df1f00
parent39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20
parentf8450829f921cf10667af98a8d08edfa3d998f04
Merge branch 'master' into next

Conflicts:
lib_generic/zlib.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
Makefile
common/cmd_bootm.c
cpu/arm920t/s3c24x0/timer.c
lib_generic/zlib.c