Merge branch 'master' into next

Conflicts:
	lib_generic/zlib.c

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc Makefile
Simple merge

diff --cc common/cmd_bootm.c
Simple merge

diff --cc cpu/arm920t/s3c24x0/timer.c
Simple merge

diff --cc lib_generic/zlib.c
index 572196865a5e32b20474f9487f0da59a57deb41f,ef1fa22806a60bf4fd62adbf9d9f8e04a0987d11..26e5af1d8e84bfa74fee86b90adb5d4cbed4b40b
--- 1/lib_generic/zlib.c
--- 2/lib_generic/zlib.c
+++ b/lib_generic/zlib.c
@@@ -26,10 -26,10 +26,12 @@@
  #define ZUTIL_H
  #define ZLIB_INTERNAL
  
 -#include "u-boot/zlib.h"
  #include <common.h>
 +#include <compiler.h>
 +#include <asm/unaligned.h>
 +#include "u-boot/zlib.h"
+ #undef        OFF                             /* avoid conflicts */
+ 
  /* To avoid a build time warning */
  #ifdef STDC
  #include <malloc.h>